[src/trunk]: src/distrib/sets Instead of guessing wether to preserve permissi...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b852fccef92f
branches:  trunk
changeset: 338482:b852fccef92f
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 27 09:26:46 2015 +0000

description:
Instead of guessing wether to preserve permissions on install operations
from the METALOG variable, default them to yes and add a new argument -U to
switch preservation off.

diffstat:

 distrib/sets/maketars |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 235f1b1162f0 -r b852fccef92f distrib/sets/maketars
--- a/distrib/sets/maketars     Wed May 27 07:52:02 2015 +0000
+++ b/distrib/sets/maketars     Wed May 27 09:26:46 2015 +0000
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.82 2015/05/26 15:46:01 martin Exp $
+# $NetBSD: maketars,v 1.83 2015/05/27 09:26:46 martin Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
 #      [-M metalog] [-N etcdir] [-F setlistsdir] [-d destdir]
-#      [-t tardir] [setname ...]
+#      [-t tardir] [-U] [setname ...]
 #
 # The default sets are "base comp debug etc games man misc tests text"
 # The X sets are "xbase xcomp xdebug xetc xfont xserver"
@@ -31,6 +31,7 @@
 setfilesonly=false
 quiet=false
 skipkeys=time,md5,sha1,sha384,sha512,rmd160,cksum
+preserve="-pe"
 
 usage()
 {
@@ -53,6 +54,7 @@
        -S              Exit after creating set files ${dest}/etc/mtree/set.*
        -M metalog      metalog file
        -N etcdir       etc dir for metalog use [${dest}/etc]
+       -U              do not preserve file permissions (with -i ..)
        -d dest         \${DESTDIR}     [${dest}]
        -t targetdir    \${RELEASEDIR}  [${tars}]
        [setname ...]   Sets to build   [${lists}]
@@ -66,7 +68,7 @@
 }
 
 # handle args
-while getopts L:bxyi:a:m:qs:F:SM:N:d:t: ch; do
+while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t: ch; do
        case ${ch} in
        L)
                save_IFS="${IFS}"
@@ -118,6 +120,9 @@
        N)
                etcdir="${OPTARG}"
                ;;
+       U)
+               preserve=""
+               ;;
        d)
                dest="${OPTARG}"
                ;;
@@ -213,10 +218,6 @@
 GZIP=-9n               # for pax -z
 export GZIP
 es=0
-preserve=
-if [ -n "${metalog}" ]; then
-       preserve="-pe"
-fi
 
 for setname in ${lists:-${nlists}}; do
        out="${setname}.tgz"