Integrate feedback from Thomas Lange (thanks for the review!)

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 6aacc75..ac8ebd3 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -231,6 +231,9 @@ as verbose unless you specify it)
 
 * support nocolor-option for /etc/grml/fai/grml/grml_cleanup_chroot
 
+* copy files from $FAI_CONFIGDIR/... instead of using 'cat > $FILE << EOF ...'
+inside the  /etc/grml/fai/config/scripts/GRML/-scripts
+
 Bugs
 ----
 

diff --git a/etc/grml/fai/config/hooks/instsoft.GRML b/etc/grml/fai/config/hooks/instsoft.GRML
index 0132f26..6f7cf08 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRML
+++ b/etc/grml/fai/config/hooks/instsoft.GRML
@@ -1,10 +1,11 @@
 #!/bin/sh
+set -u
+set -e
+
 # make sure we have file-rc available before
 # package_config/GRML is being executed:
-if [ -z "$target" ] ; then
-        echo "Fatal: $target unset for $0 - can not continue therefore."
-        exit 1
-fi
+
+# TODO: test whether adding file-rc to FAI_DEBOOTSTRAP_OPTS= would do the trick too
 
 # work around http://trac.lighttpd.net/trac/ticket/657:
 echo "Acquire::http::Pipeline-Depth "0";" >> $target/etc/apt/apt.conf
@@ -12,26 +13,26 @@ echo "Acquire::http::Pipeline-Depth "0";" >> $target/etc/apt/apt.conf
 # install grml keys:
 gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
 gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
-chroot $target apt-key add /etc/apt/grml.key
+$ROOTCMD apt-key add /etc/apt/grml.key
 
 # finally install file-rc:
-chroot $target apt-get update
-chroot $target apt-get --download-only --assume-yes install file-rc
-chroot $target /bin/sh -c "dpkg -i --force-all /var/cache/apt/archives/file-rc*.deb"
-chroot $target apt-get -f install file-rc
+$ROOTCMD apt-get update
+$ROOTCMD apt-get --download-only --assume-yes install file-rc
+$ROOTCMD /bin/sh -c "dpkg -i --force-all /var/cache/apt/archives/file-rc*.deb"
+$ROOTCMD apt-get -f install file-rc
 
 # we don't need the invoke-rc.d and update-rc.d diversion
 # because otherwise use of file-rc with aptitude fails:
 if [ -L "$target"/usr/sbin/invoke-rc.d ] ; then
    rm -f "$target"/usr/sbin/invoke-rc.d
-   chroot $target dpkg-divert --package fai --rename --remove /usr/sbin/invoke-rc.d
+   $ROOTCMD dpkg-divert --package fai --rename --remove /usr/sbin/invoke-rc.d
 fi
 if [ -L "$target"/usr/sbin/update-rc.d ] ; then
    dpkg --purge sysv-rc
-   chroot $target apt-get --assume-yes --reinstall install file-rc
+   $ROOTCMD apt-get --assume-yes --reinstall install file-rc
 fi
 
 # debug:
-# chroot $target /bin/bash
+# $ROOTCMD /bin/bash
 
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3

diff --git a/etc/grml/fai/config/scripts/GRML/05-hostname b/etc/grml/fai/config/scripts/GRML/05-hostname
index 529614a..cd83aa5 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/05-hostname
+++ b/etc/grml/fai/config/scripts/GRML/05-hostname
@@ -6,4 +6,4 @@ HOSTNAME=''
 [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
-echo "$HOSTNAME" > "$target"/etc/hostname
+echo "$HOSTNAME" > $target/etc/hostname

diff --git a/etc/grml/fai/config/scripts/GRML/10-build-initramfs b/etc/grml/fai/config/scripts/GRML/10-build-initramfs
index be9f48f..b35a0cb 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/10-build-initramfs
+++ b/etc/grml/fai/config/scripts/GRML/10-build-initramfs
@@ -2,8 +2,8 @@
 set -u
 set -e
 
-cp /etc/grml/fai/live-initramfs/live.conf "$target/etc/live.conf"
+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"
-FILE=$(ls -1 "$target"/boot/vmlinuz-* | sort -r | head -1)
+FILE=$(ls -1 $target/boot/vmlinuz-* | sort -r | head -1)
 KERNELVERSION=$(echo "${FILE##$target/boot/vmlinuz-}")
-chroot $target update-initramfs -c -t -k $KERNELVERSION
+$ROOTCMD update-initramfs -c -t -k $KERNELVERSION

diff --git a/etc/grml/fai/config/scripts/GRML/15-initsetup b/etc/grml/fai/config/scripts/GRML/15-initsetup
index bdd5dbd..1b23d5e 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRML/15-initsetup
@@ -2,8 +2,8 @@
 set -u
 set -e
 
-if grep -q "small" "$target"/etc/grml_version ; then
-   cp "$target"/etc/runlevel.conf.livecd.small "$target"/etc/runlevel.conf
+if grep -q 'small' $target/etc/grml_version ; then
+   cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
 else
-   cp "$target"/etc/runlevel.conf.livecd "$target"/etc/runlevel.conf
+   cp $target/etc/runlevel.conf.livecd $target/etc/runlevel.conf
 fi

diff --git a/etc/grml/fai/config/scripts/GRML/20-sudo b/etc/grml/fai/config/scripts/GRML/20-sudo
index 3c648ea..502f2ae 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/20-sudo
+++ b/etc/grml/fai/config/scripts/GRML/20-sudo
@@ -6,7 +6,8 @@ USERNAME=''
 [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
 [ -n "$USERNAME" ] || USERNAME=grml
 
-cat > "$target"/etc/sudoers << EOF
+# FIXME: use /etc/grml/fai/... as base
+cat > $target/etc/sudoers << EOF
 # sudoers file.
 # This file MUST be edited with the "visudo" command as root.
 # See the man page for details on how to write a sudoers file.

diff --git a/etc/grml/fai/config/scripts/GRML/21-usersetup b/etc/grml/fai/config/scripts/GRML/21-usersetup
index 30c01dc..87d5ad2 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRML/21-usersetup
@@ -6,11 +6,11 @@ USERNAME=''
 [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
 [ -n "$USERNAME" ] || USERNAME=grml
 
-chroot "$target" addgroup --gid 1000 $USERNAME
-chroot "$target" useradd -d /home/$USERNAME -m -s /bin/zsh -g 1000 $USERNAME
+$ROOTCMD addgroup --gid 1000 $USERNAME
+$ROOTCMD useradd -d /home/$USERNAME -m -s /bin/zsh -g 1000 $USERNAME
 
-sed -i 's/^root::/root:*:/' "$target"/etc/shadow
-sed -i 's/^$USERNAME::/$USERNAME:*:/' "$target"/etc/shadow
+sed -i 's/^root::/root:*:/' $target/etc/shadow
+sed -i 's/^$USERNAME::/$USERNAME:*:/' $target/etc/shadow
 
-chroot "$target" chsh -s /bin/zsh root
-chroot "$target" chsh -s /bin/zsh $USERNAME
+$ROOTCMD chsh -s /bin/zsh root
+$ROOTCMD chsh -s /bin/zsh $USERNAME

diff --git a/etc/grml/fai/config/scripts/GRML/25-locales b/etc/grml/fai/config/scripts/GRML/25-locales
index 79f2d25..ba51c6d 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/25-locales
+++ b/etc/grml/fai/config/scripts/GRML/25-locales
@@ -2,5 +2,5 @@
 set -u
 set -e
 
-cp "$target"/etc/locale.gen.minimal "$target"/etc/locale.gen
-chroot "$target" locale-gen
+cp $target/etc/locale.gen.minimal $target/etc/locale.gen
+$ROOTCMD locale-gen

diff --git a/etc/grml/fai/config/scripts/GRML/30-fstab b/etc/grml/fai/config/scripts/GRML/30-fstab
index 63af770..0ee52d1 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/30-fstab
+++ b/etc/grml/fai/config/scripts/GRML/30-fstab
@@ -6,6 +6,7 @@ USERNAME=''
 [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
 [ -n "$USERNAME" ] || USERNAME=grml
 
+# FIXME: use /etc/grml/fai/... as base
 cat > "$target"/etc/fstab << EOF
 # /etc/fstab - static file system information
 # <filesystem> <mountpoint>   <type> <options>                             <dump> <pass>

diff --git a/etc/grml/fai/config/scripts/GRML/31-motd b/etc/grml/fai/config/scripts/GRML/31-motd
index 705446c..2f1e775 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/31-motd
+++ b/etc/grml/fai/config/scripts/GRML/31-motd
@@ -2,4 +2,4 @@
 set -u
 set -e
 
-chroot "$target" mv /etc/motd.dpkg-new /var/run/motd
+$ROOTCMD mv /etc/motd.dpkg-new /var/run/motd

diff --git a/etc/grml/fai/config/scripts/GRML/33-aptsetup b/etc/grml/fai/config/scripts/GRML/33-aptsetup
index 817c5ee..5a754d2 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRML/33-aptsetup
@@ -2,11 +2,12 @@
 set -u
 set -e
 
-rm -f "$target/etc/apt/sources.list"
+rm -f $target/etc/apt/sources.list
 
-chroot "$target" ln -s /etc/apt/sources.list.grml /etc/apt/sources.list
+$ROOTCMD ln -s /etc/apt/sources.list.grml /etc/apt/sources.list
 
-cat > "$target"/etc/apt/preferences << EOF
+# FIXME: use /etc/grml/fai/... as base
+cat > $target/etc/apt/preferences << EOF
 // main grml-repository:
 Package: *
 Pin: origin deb.grml.org

diff --git a/etc/grml/fai/config/scripts/GRML/34-hosts b/etc/grml/fai/config/scripts/GRML/34-hosts
index 3d30bba..d3ae45b 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/34-hosts
+++ b/etc/grml/fai/config/scripts/GRML/34-hosts
@@ -6,7 +6,8 @@ HOSTNAME=''
 [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
-cat > "$target"/etc/hosts << EOF
+# FIXME: use /etc/grml/fai/... as base
+cat > $target/etc/hosts << EOF
 127.0.0.1       $HOSTNAME    localhost
 
 # The following lines are desirable for IPv6 capable hosts

diff --git a/etc/grml/fai/config/scripts/GRML/35-network b/etc/grml/fai/config/scripts/GRML/35-network
index 759634b..59cc2e4 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/35-network
+++ b/etc/grml/fai/config/scripts/GRML/35-network
@@ -2,7 +2,8 @@
 set -u
 set -e
 
-cat >> "$target"/etc/network/interfaces << EOF
+# FIXME: use /etc/grml/fai/... as base
+cat >> $target/etc/network/interfaces << EOF
 # The loopback interface
 # automatically added when upgrading
 auto lo

diff --git a/etc/grml/fai/config/scripts/GRML/90-update-alternatives b/etc/grml/fai/config/scripts/GRML/90-update-alternatives
index 6100e77..40b64b5 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRML/90-update-alternatives
@@ -2,6 +2,7 @@
 set -u
 set -e
 
-if [ -r "$target"/usr/bin/vim.basic ] ; then
-   chroot "$target" update-alternatives --set editor /usr/bin/vim.basic
+# FIXME: use /etc/grml/fai/... as base
+if [ -r $target/usr/bin/vim.basic ] ; then
+   $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic
 fi

diff --git a/etc/grml/fai/config/scripts/GRML/98-clean-chroot b/etc/grml/fai/config/scripts/GRML/98-clean-chroot
index 6404795..4413e7e 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRML/98-clean-chroot
@@ -2,6 +2,6 @@
 set -u
 set -e
 
-cp /etc/grml/fai/grml/grml_cleanup_chroot "$target/root/"
-chroot "$target" /root/grml_cleanup_chroot
-rm "$target/root/grml_cleanup_chroot"
+cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/
+$ROOTCMD /root/grml_cleanup_chroot
+rm $target/root/grml_cleanup_chroot

diff --git a/etc/grml/fai/config/scripts/GRML/99-finish-grml-build b/etc/grml/fai/config/scripts/GRML/99-finish-grml-build
index 7c58255..6f8a3f7 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRML/99-finish-grml-build
@@ -2,4 +2,4 @@
 set -u
 set -e
 
-touch "$target"/etc/grml_cd
+touch $target/etc/grml_cd

diff --git a/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives b/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives
index 6a5fd56..242e619 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives
@@ -2,10 +2,10 @@
 set -u
 set -e
 
-if [ -r "$target"/usr/bin/xterm ] ; then
-   chroot "$target" update-alternatives --set x-terminal-emulator /usr/bin/xterm
+if [ -r $target/usr/bin/xterm ] ; then
+   $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/xterm
 fi
 
-if [ -r "$target"/etc/X11/cursors/whiteglass.theme ] ; then
-   chroot "$target" update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme
+if [ -r $target/etc/X11/cursors/whiteglass.theme ] ; then
+   $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme
 fi