From d9810a364404c6b317287979b15d3b83389bdd64 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@debian.org>
Date: Sun, 12 Oct 2008 13:46:28 +0100
Subject: Ensure all files installed via chroot_local-includes are owned by
root:root. Thanks to Julien Cristau <jcristau@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.
---
helpers/lh_chroot_hacks | 8 --------
helpers/lh_chroot_local-includes | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
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
--
cgit v1.0