From: Michael Prokop <mika@grml.org>
Date: Sun, 26 Jun 2011 12:36:02 +0000 (+0200)
Subject: grml-live: try updating initramfs if creating fresh one failed.
X-Git-Tag: v0.15.0~32
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=b8c8c53e77da46efb3a4ca0894d74e9604584d85

grml-live: try updating initramfs if creating fresh one failed.
---

diff --git a/grml-live b/grml-live
index 879565b..6141284 100755
--- a/grml-live
+++ b/grml-live
@@ -559,7 +559,8 @@ else
          eerror "Error: critical error while executing fai [exit code ${RC}]. Exiting." ; eend 1
          bailout 1
       else
-         log "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]"
+         einfo "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]"
+         log   "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]"
          echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]" > $CHROOT_OUTPUT/etc/grml_version
          chmod 644 $CHROOT_OUTPUT/etc/grml_version
          einfo "Rebuilding initramfs"
@@ -568,7 +569,11 @@ else
          # kernel version anyway right now)
          # chroot $CHROOT_OUTPUT update-initramfs -u -t => might break when using kernel-package :(
          for initrd in "$(basename $CHROOT_OUTPUT/boot/vmlinuz-*)" ; do
-           chroot $CHROOT_OUTPUT update-initramfs -k "${initrd##vmlinuz-}" -c
+           if ! chroot $CHROOT_OUTPUT update-initramfs -k "${initrd##vmlinuz-}" -c ; then
+             einfo "Creating fresh initrd did not work, trying update instead:"
+             log   "Creating fresh initrd did not work, trying update instead:"
+             chroot $CHROOT_OUTPUT update-initramfs -k "${initrd##vmlinuz-}" -u
+           fi
          done
          eend $?
       fi