From: Michael Prokop <mika@grml.org>
Date: Wed, 22 Apr 2009 22:22:22 +0000 (+0200)
Subject: Improve /etc/grml/fai/live-initramfs/live.conf handling
X-Git-Tag: v0.9.13~11
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=4d3cdad3f1578e31f57c6d5b62b1fe4af4267657

Improve /etc/grml/fai/live-initramfs/live.conf handling
---

diff --git a/debian/changelog b/debian/changelog
index 0429b49..e6f886d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ grml-live (0.9.13) UNRELEASED; urgency=low
   * Bump Standard-Version to 3.8.1 (no further changes).
   * Add virtualbox-ose-guest-x11 to GRML_FULL and GRML_MEDIUM.
   * Add virtualbox-ose-guest-modules-2.6.28-grml to GRML_MEDIUM.
+  * Install /etc/grml/fai/live-initramfs/live.conf only if
+    /etc/live.conf does not exist in the target yet.
 
- -- Michael Prokop <mika@grml.org>  Mon, 20 Apr 2009 12:56:21 +0200
+ -- Michael Prokop <mika@grml.org>  Thu, 23 Apr 2009 00:20:41 +0200
 
 grml-live (0.9.12) unstable; urgency=low
 
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
index 16283a4..9777a52 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
@@ -8,8 +8,17 @@
 
 set -e
 
-cp /etc/grml/fai/live-initramfs/live.conf $target/etc/live.conf
-cp /etc/grml/fai/live-initramfs/grml-script.init-top "$target/usr/share/initramfs-tools/scripts/init-top/grml"
+if ! [ -f "$target/etc/live.conf" ] ; then
+  echo "Warning: $target/etc/live.conf does not exist yet,"
+  echo "         ... installing /etc/grml/fai/live-initramfs/live.conf"
+  cp /etc/grml/fai/live-initramfs/live.conf "$target/etc/live.conf"
+fi
+
+if [ -f /etc/grml/fai/live-initramfs/grml-script.init-top ] ; then
+  cp /etc/grml/fai/live-initramfs/grml-script.init-top "$target/usr/share/initramfs-tools/scripts/init-top/grml"
+else
+  echo "Warning: /etc/grml/fai/live-initramfs/grml-script.init-top could not be read"
+fi
 
 FILE=$(ls -1 $target/boot/vmlinuz-* 2>/dev/null| sort -r | head -1)
 KERNELVERSION=$(echo "${FILE##$target/boot/vmlinuz-}")
diff --git a/etc/grml/fai/live-initramfs/live.conf b/etc/grml/fai/live-initramfs/live.conf
index 930ae22..a50296e 100644
--- a/etc/grml/fai/live-initramfs/live.conf
+++ b/etc/grml/fai/live-initramfs/live.conf
@@ -1,3 +1,9 @@
+##################################################################
+# Notice: this file is NOT the official configuration file of
+# the Debian package live-initramfs but instead is installed by
+# /etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
+##################################################################
+
 # /etc/live.conf - configuration file for live-initramfs(7)
 
 # We have a Debian based system of course:
@@ -8,44 +14,36 @@ export USERNAME="grml"
 export USERFULLNAME="grml user"
 export HOSTNAME="grml"
 
-# unionfs or aufs?
-export UNIONTYPE="aufs"
-# we do not want to have a modified /etc/initab:
-export NOAUTOLOGIN="Yes"
-# grml does not require /fastboot:
-export NOFASTBOOT="Yes"
 # disable "mount failed for selinuxfs on /selinux" warning message:
 export SELINUX_INIT="No"
-# do not touch /etc/sudoers:
-export NOSUDO="Yes"
-# do not touch anything inside passwd/shadow/group/gshadow:
-export NOUSER="Yes"
-# do not generate xorg.conf via dexconf - let's use grml-x instead:
-export NOXAUTOCONFIG="Yes"
-# do not modify /etc/fstab:
-export NOFSTAB="Yes"
-# do not modify /etc/hosts:
-export NOHOSTS="Yes"
+# unionfs or aufs?
+export UNIONTYPE="aufs"
 
-export NOACCESSIBILITY="Yes"
-export NOAPPARMOR="Yes"
-export NOAPTCDROM="Yes"
-export NOCONSOLEKEYBOARD="Yes"
-export NOFSTAB="Yes"
-export NOKPERSONALIZER="Yes"
-export NOKWALLET="Yes"
-export NOLANGUAGESELECTOR="Yes"
-export NOLOCALES="Yes"
-export NONETWORKING="Yes"
-export NOPERSISTENT="Yes"
-export NOPOWERMANAGEMENT="Yes"
-export NOPRESEED="Yes"
-export NOPROGRAMCRASHES="Yes"
-export NORESTRICTEDMANAGER="Yes"
-export NOTIMEZONE="Yes"
-export NOUPDATENOTIFIER="Yes"
-export NOXAUTOLOGIN="Yes"
-export NOXSCREENSAVER="Yes"
-export NOGNOMEPANEL="Yes"
+#export NOAUTOLOGIN="Yes"
+#export NOFASTBOOT="Yes"
+#export NOSUDO="Yes"
+#export NOUSER="Yes"
+#export NOXAUTOCONFIG="Yes"
+#export NOFSTAB="Yes"
+#export NOHOSTS="Yes"
+#export NOPERSISTENT="Yes"
+#export NOACCESSIBILITY="Yes"
+#export NOAPPARMOR="Yes"
+#export NOAPTCDROM="Yes"
+#export NOCONSOLEKEYBOARD="Yes"
+#export NOGNOMEPANEL="Yes"
+#export NOKPERSONALIZER="Yes"
+#export NOKWALLET="Yes"
+#export NOLANGUAGESELECTOR="Yes"
+#export NOLOCALES="Yes"
+#export NONETWORKING="Yes"
+#export NOPOWERMANAGEMENT="Yes"
+#export NOPRESEED="Yes"
+#export NOPROGRAMCRASHES="Yes"
+#export NORESTRICTEDMANAGER="Yes"
+#export NOTIMEZONE="Yes"
+#export NOUPDATENOTIFIER="Yes"
+#export NOXAUTOLOGIN="Yes"
+#export NOXSCREENSAVER="Yes"
 
 # EOF