projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f3b335e
)
grml-live: try updating initramfs if creating fresh one failed.
author
Michael Prokop
<mika@grml.org>
Sun, 26 Jun 2011 12:36:02 +0000
(14:36 +0200)
committer
Michael Prokop
<mika@grml.org>
Sun, 26 Jun 2011 17:26:57 +0000
(19:26 +0200)
grml-live
patch
|
blob
|
history
diff --git
a/grml-live
b/grml-live
index
879565b
..
6141284
100755
(executable)
--- 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
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"
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
# 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
done
eend $?
fi