Date: Wed, 30 May 2018 13:51:00 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334381 - head/tools/tools/makeroot Message-ID: <201805301351.w4UDp0bL068650@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed May 30 13:51:00 2018 New Revision: 334381 URL: https://svnweb.freebsd.org/changeset/base/334381 Log: makeroot.sh: allow duplicate entries even with -f <filelist> makefs disallows duplicate entries unless the -D option is specified. Previously makeroot.sh enabled -D unless a filelist was provided via the -f options. The filelist logic creates an mtree manifest from the METALOG and the provided filelist by passing them through `sort -u`, so duplicates were not expected. However, duplicates can still occur when a directory appears in multiple packages -- for example, ./etc/pam.d type=dir uname=root gname=wheel mode=0755 ./etc/pam.d type=dir mode=0755 tags=package=runtime ./etc/pam.d type=dir mode=0755 tags=package=at ./etc/pam.d type=dir mode=0755 tags=package=ftp ./etc/pam.d type=dir mode=0755 tags=package=telnet For the purposes of makefs these directory entries are identical, but are of course not identical for sort -u. For now just leave the allow duplicates -D flag enabled. PR: 228606 Sponsored by: The FreeBSD Foundation Modified: head/tools/tools/makeroot/makeroot.sh Modified: head/tools/tools/makeroot/makeroot.sh ============================================================================== --- head/tools/tools/makeroot/makeroot.sh Wed May 30 12:55:27 2018 (r334380) +++ head/tools/tools/makeroot/makeroot.sh Wed May 30 13:51:00 2018 (r334381) @@ -80,7 +80,7 @@ while getopts "B:de:f:g:K:k:l:p:s:" opt; do B) BFLAG="-B ${OPTARG}" ;; d) DEBUG=1 ;; e) EXTRAS="${EXTRAS} ${OPTARG}" ;; - f) FILELIST="${OPTARG}"; DUPFLAG= ;; + f) FILELIST="${OPTARG}";; g) GROUP="${OPTARG}" ;; K) KEYUSERS="${KEYUSERS} ${OPTARG}" ;; k) KEYDIR="${OPTARG}" ;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805301351.w4UDp0bL068650>