From: Michael Prokop Date: Mon, 6 Jun 2011 20:34:12 +0000 (+0200) Subject: Try to reduce build time and do not build initramfs twice. X-Git-Tag: v0.15.0~49 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=d95eed100eaf3c6b134cc24c93340d258ba81695 Try to reduce build time and do not build initramfs twice. Lets see whether this might break in any situation (thinking of certain combinations of softupdate, renames,... during release management) but building the initramfs takes just too long, so let's try to reduce the build time via building it only from within main grml-live script and no longer execute update-initramfs in the /etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs script. --- diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs index bf6b7d9..ea21a6a 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs +++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs @@ -12,20 +12,12 @@ fcopy /usr/share/initramfs-tools/scripts/init-top/grml fcopy /etc/initramfs-tools/hooks/000-udev-shutup fcopy /etc/initramfs-tools/conf.d/xz-compress -FILE=$(ls -1 $target/boot/vmlinuz-* 2>/dev/null| sort -r | head -1) -KERNELVERSION=$(echo "${FILE##$target/boot/vmlinuz-}") - -if [ -z "$KERNELVERSION" ] ; then - echo "Error: No kernel found, can not create initramfs. Exiting.">&2 +if ! [ -f $target/usr/share/initramfs-tools/scripts/live ] ; then + echo "Error: live-boot/-initramfs does not seem to be present, can not create initramfs. Exiting.">&2 exit 1 fi -if [ -f $target/usr/share/initramfs-tools/scripts/live ] ; then - $ROOTCMD update-initramfs -c -t -k $KERNELVERSION -else - echo "Error: live-initramfs does not seem to be present, can not create initramfs. Exiting.">&2 - exit 1 -fi +# The initramfs itself will be created through grml-live script itself. ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3