[SCM] Debian Live build scripts branch, master, updated. 1.0.1-1-26-g75d5d74

[Chris Lamb]

The following commit has been merged in the master branch:
commit 30ae127e687d19012d16d88b47ebc91a2f3cab53
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Oct 12 13:46:28 2008 +0100

    Ensure all files installed via chroot_local-includes are owned by root:root. Thanks to Julien Cristau <jcristau at debian.org>.
    
    This may cause problems for users who are relying on the target uid and gid
    of the files in the build system's config/chroot_local-includes being the
    same on the live image.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index e2cb8cc..a202179 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -100,14 +100,6 @@ then
 	chown -R --quiet 999:999 chroot/home/${LH_USERNAME}
 fi
 
-# Setting ownership for /etc/skel - this is where people often include stuff
-# through local includes.
-chown -R --quiet 0:0 chroot/home/etc/skel
-
-# Making sure /etc/sudoers has right owner/permissions
-chown --quiet 0:0 chroot/home/etc/sudoers
-chmod 0440 chroot/etc/sudoers
-
 # This is a temporary hack to get rid of fstab;
 # needs cleanup in live-initramfs first to proper fix.
 if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes
index c1308e1..ecb68c7 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -46,7 +46,7 @@ if Find_files config/chroot_local-includes/
 then
 	# Copying includes
 	cd config/chroot_local-includes
-	find . | cpio -dmpu "${OLDPWD}"/chroot
+	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot
 	cd "${OLDPWD}"
 
 	# Creating stage file

-- 
Debian Live build scripts