From dbef0b91bf6d0b6d4cc858065f167379fee97156 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sat, 11 Aug 2012 12:17:56 +0200 Subject: Fix ownership when copying files from chroot to system Previously files were always owned by nobody which means trying to write to them directly would fail because only the owner has +w. Signed-off-by: Florian Pritz Signed-off-by: Pierre Schmitz --- makechrootpkg.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'makechrootpkg.in') diff --git a/makechrootpkg.in b/makechrootpkg.in index 48675d7..9ed7161 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -25,6 +25,7 @@ passeddir= default_copy=$USER [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER [[ -z $default_copy || $default_copy = root ]] && default_copy=copy +src_owner=${SUDO_USER:-$USER} usage() { echo "usage ${0##*/} [options] -r [--] [makepkg args]" @@ -292,10 +293,12 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then popd >/dev/null fi + chown "$src_owner" "$pkgfile" mv "$pkgfile" "$PKGDEST" done for l in "$copydir"/build/*-{build,check,namcap,package,package_*}.log; do + chown "$src_owner" "$l" [[ -f $l ]] && mv "$l" . done else @@ -304,6 +307,7 @@ else fi for f in "$copydir"/srcdest/*; do + chown "$src_owner" "$f" mv "$f" "$SRCDEST" done -- cgit v1.2.3-70-g09d2