[PC-BSD Commits] r19524 - pcbsd/current/build-files/scripts

[svn at pcbsd.org]

Author: kris
Date: 2012-09-25 18:38:11 +0000 (Tue, 25 Sep 2012)
New Revision: 19524

Modified:
   pcbsd/current/build-files/scripts/mergedesktop.sh
   pcbsd/current/build-files/scripts/mergetrueos.sh
Log:

Fix copying files from overlay



Modified: pcbsd/current/build-files/scripts/mergedesktop.sh
===================================================================
--- pcbsd/current/build-files/scripts/mergedesktop.sh	2012-09-25 17:58:52 UTC (rev 19523)
+++ pcbsd/current/build-files/scripts/mergedesktop.sh	2012-09-25 18:38:11 UTC (rev 19524)
@@ -12,8 +12,8 @@
 fi
 
 # Lets do it
-tar cvf - -C ../../overlays/desktop-overlay --exclude ./etc --exclude ./boot --exclude ./usr/local/etc . 2>/dev/null | tar xvf - -C /
+tar cvf - -C ../../overlays/desktop-overlay --exclude ./etc --exclude ./boot --exclude ./usr/local/etc . 2>/dev/null | tar xvf - --uname root --gname wheel -C /
 
 if [ `uname -m` = "amd64" ]; then
-   tar cvf - -C ../../overlays/desktop-overlay64 --exclude ./etc --exclude ./boot --exclude ./usr/local/etc . 2>/dev/null | tar xvf - -C /
+   tar cvf - -C ../../overlays/desktop-overlay64 --exclude ./etc --exclude ./boot --exclude ./usr/local/etc . 2>/dev/null | tar xvf - --uname root --gname wheel -C /
 fi

Modified: pcbsd/current/build-files/scripts/mergetrueos.sh
===================================================================
--- pcbsd/current/build-files/scripts/mergetrueos.sh	2012-09-25 17:58:52 UTC (rev 19523)
+++ pcbsd/current/build-files/scripts/mergetrueos.sh	2012-09-25 18:38:11 UTC (rev 19524)
@@ -12,4 +12,8 @@
 fi
 
 # Lets do it
-tar cvf - -C ../../overlays/server-overlay64 --exclude ./etc --exclude ./boot --exclude ./usr/local/etc . 2>/dev/null | tar xvf - -C /
+tar cvf - -C ../../overlays/server-overlay --exclude ./etc --exclude ./boot --exclude ./usr/local/etc . 2>/dev/null | tar xvf - --uname root --gname wheel -C /
+
+if [ "`uname -m`" = "amd64" ] ; then
+   tar cvf - -C ../../overlays/server-overlay64 --exclude ./etc --exclude ./boot --exclude ./usr/local/etc . 2>/dev/null | tar xvf - --uname root --gname wheel -C /
+fi