From 74bdfbc3a5dc7be44951c44c22feb109b9bc0a50 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 17 Mar 2012 18:03:13 +0100 Subject: [PATCH] Add --no-preserve=ownership to cp -a commands to avoid passing non-root ownership from build system to target --- makedist.inc.sh | 6 +++--- platforms/bootcd/post.inc.sh | 2 +- platforms/bootusb-test/post.inc.sh | 6 +++--- platforms/bootusb/post.inc.sh | 6 +++--- platforms/installdvd/post.inc.sh | 4 ++-- platforms/livecd/post.inc.sh | 4 ++-- platforms/livedvd/post.inc.sh | 4 ++-- platforms/packages-dvd/pre.inc.sh | 2 +- platforms/testcd/post.inc.sh | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/makedist.inc.sh b/makedist.inc.sh index b2b5469..233b048 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -154,14 +154,14 @@ rm -rf $MOUNTDIR/tmp/kde-root # copy static files for target [ -e $TARGETDIR/root ] && - cp -a $TARGETDIR/root/* $MOUNTDIR/ + cp -a --no-preserve=ownership $TARGETDIR/root/* $MOUNTDIR/ # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root -a "`ls $TARGETDIR/platforms/$PLATFORM/root/* 2>/dev/null`" ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR/ # copy localized static files for specific platform [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/ produce_media diff --git a/platforms/bootcd/post.inc.sh b/platforms/bootcd/post.inc.sh index 767702d..5b6ddc8 100644 --- a/platforms/bootcd/post.inc.sh +++ b/platforms/bootcd/post.inc.sh @@ -61,7 +61,7 @@ _EOF # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ MOUNTDIR=$MOUNTDIR2 produce_media diff --git a/platforms/bootusb-test/post.inc.sh b/platforms/bootusb-test/post.inc.sh index 071e989..3f462ae 100644 --- a/platforms/bootusb-test/post.inc.sh +++ b/platforms/bootusb-test/post.inc.sh @@ -52,18 +52,18 @@ _EOF mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest # copy /boot directory to final root -cp -a $MOUNTDIR/boot $MOUNTDIR2 +cp -a --no-preserve=ownership $MOUNTDIR/boot $MOUNTDIR2 # copy syslinux addons to final root /boot dir cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/ # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ # copy localized static files for specific platform [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ ## add buildinfo #buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]" diff --git a/platforms/bootusb/post.inc.sh b/platforms/bootusb/post.inc.sh index 0b1c286..de06574 100644 --- a/platforms/bootusb/post.inc.sh +++ b/platforms/bootusb/post.inc.sh @@ -76,18 +76,18 @@ _EOF mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest # copy /boot directory to final root -cp -a $MOUNTDIR/boot $MOUNTDIR2 +cp -a --no-preserve=ownership $MOUNTDIR/boot $MOUNTDIR2 # copy syslinux addons to final root /boot dir cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/ # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ # copy localized static files for specific platform [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ ## add buildinfo #buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]" diff --git a/platforms/installdvd/post.inc.sh b/platforms/installdvd/post.inc.sh index 57e734e..ac1594c 100644 --- a/platforms/installdvd/post.inc.sh +++ b/platforms/installdvd/post.inc.sh @@ -73,11 +73,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/ # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ # copy localized static files for specific platform [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ # add buildinfo buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]" diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh index cb8ba54..a1d749f 100644 --- a/platforms/livecd/post.inc.sh +++ b/platforms/livecd/post.inc.sh @@ -112,11 +112,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/ # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ # copy localized static files for specific platform [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ # add buildinfo buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]" diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh index cb8ba54..a1d749f 100644 --- a/platforms/livedvd/post.inc.sh +++ b/platforms/livedvd/post.inc.sh @@ -112,11 +112,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/ # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ # copy localized static files for specific platform [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ # add buildinfo buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]" diff --git a/platforms/packages-dvd/pre.inc.sh b/platforms/packages-dvd/pre.inc.sh index e27531d..a6fc501 100644 --- a/platforms/packages-dvd/pre.inc.sh +++ b/platforms/packages-dvd/pre.inc.sh @@ -42,7 +42,7 @@ echo "Creating packages DVD..." # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR/ produce_media diff --git a/platforms/testcd/post.inc.sh b/platforms/testcd/post.inc.sh index cb8ba54..a1d749f 100644 --- a/platforms/testcd/post.inc.sh +++ b/platforms/testcd/post.inc.sh @@ -112,11 +112,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/ # copy static files for specific platform [ -e $TARGETDIR/platforms/$PLATFORM/root ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/ # copy localized static files for specific platform [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] && - cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ + cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/ # add buildinfo buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"