summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-03-07 18:12:26 +0100
committerDaniel Baumann <daniel@debian.org>2012-03-07 18:12:26 +0100
commit8fa786ba892bff6e5ffbb90c9cdb0061d3b32b87 (patch)
tree06fbc6178be10073acdb932c11929a970d1857b0
parent98192da0b99a5d689c24e7d8c87c1a614fdaaeb8 (diff)
downloadvyos-live-build-8fa786ba892bff6e5ffbb90c9cdb0061d3b32b87.tar.gz
vyos-live-build-8fa786ba892bff6e5ffbb90c9cdb0061d3b32b87.zip
Avoid calling update-initrd in lb_chroot_hacks if the target system has no initrd, thanks to Hector Oron <zumbi@debian.org>.
-rwxr-xr-xscripts/build/lb_chroot_hacks5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 128d6b849..1356112d3 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -174,7 +174,10 @@ case "${LB_INITRAMFS}" in
;;
esac
-Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
+if [ "${LB_INITRAMFS}" != "none" ]
+then
+ Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
+fi
# We probably ought to use COMPRESS= in a temporary file in
# /etc/initramfs-tools/conf.d/ instead, but it's hard to pass options that