[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-23-gd25a7c3

Cyril Brulebois cyril.brulebois at kerlabs.com
Fri Jan 23 21:24:17 UTC 2009


The following commit has been merged in the master branch:
commit d25a7c348cd9789398d7c9ea177f195e01c80c69
Author: Cyril Brulebois <cyril.brulebois at kerlabs.com>
Date:   Fri Jan 23 21:43:46 2009 +0100

    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.

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

-- 
Debian Live build scripts



More information about the debian-live-changes mailing list