summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Brulebois <cyril.brulebois@kerlabs.com>2009-01-23 21:43:46 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:40 +0100
commit4652d65411e39b3431fa852dcab1fcdc9948b860 (patch)
treebfd486cf3a5f50436006f343029579f20b445590
parentf5cb9b046b919b793127853b2b45037a564f9a29 (diff)
downloadlive-build-4652d65411e39b3431fa852dcab1fcdc9948b860.zip
live-build-4652d65411e39b3431fa852dcab1fcdc9948b860.tar.gz
Make hacks not break if there are no initrds.
Even if it's likely that initrds will be present at this stage, it might be that they went away because of local hooks, and hacks shouldn't break just because of missing initrds.
-rwxr-xr-xhelpers/lh_chroot_hacks4
1 files changed, 3 insertions, 1 deletions
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 4737425..c635909 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -76,7 +76,9 @@ fi
# Ensure readable permissions on initramfs. loop-aes-utils sets umask to
# protect GPG keys, which live-helper does not support.
-chmod go+r chroot/boot/initrd*
+# Note: Use find rather than chmod on the wildcard, one never knows what
+# people might do in local hooks, and there might be no initrds at all.
+find chroot/boot -name 'initrd*' -print0 | xargs -0 chmod go+r
# Remove build systems clock drift
echo "0.0 0 0.0" > chroot/etc/adjtime