Rename /etc/grml/fai/files to /etc/grml/fai/config/files and move /etc/grml/fai/live...

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 10-build-initramfs

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
index 9777a52..d6930fe 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
@@ -8,27 +8,12 @@
 
 set -e
 
-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
+fcopy /etc/live.conf
+fcopy /usr/share/initramfs-tools/scripts/init-top/grml
 
 FILE=$(ls -1 $target/boot/vmlinuz-* 2>/dev/null| sort -r | head -1)
 KERNELVERSION=$(echo "${FILE##$target/boot/vmlinuz-}")
 
-# make sure mdadm isn't executed in initrd:
-#if [ -f "$target"/etc/default/mdadm ] ; then
-#   sed -i "s/START_DAEMON=.*/START_DAEMON=false/" "$target"/etc/default/mdadm
-#   sed -i "s/INITRDSTART=.*/INITRDSTART=none/"    "$target"/etc/default/mdadm
-#fi
-
 if [ -z "$KERNELVERSION" ] ; then
    echo "Error: No kernel found, can not create initramfs. Exiting.">&2
    exit 1