Module Name: src
Committed By: uebayasi
Date: Sat May 24 13:27:13 UTC 2014
Modified Files:
src/distrib/sets: regpkg
Log Message:
Unbreak syspkg by escaping '[' by vis(1) to match the new mtree(8) format.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/regpkg
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/regpkg
diff -u src/distrib/sets/regpkg:1.20 src/distrib/sets/regpkg:1.21
--- src/distrib/sets/regpkg:1.20 Sat Nov 3 07:59:46 2012
+++ src/distrib/sets/regpkg Sat May 24 13:27:13 2014
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: regpkg,v 1.20 2012/11/03 07:59:46 mbalmer Exp $
+# $NetBSD: regpkg,v 1.21 2014/05/24 13:27:13 uebayasi Exp $
#
# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -628,7 +628,7 @@ EOF
# "@name" line and a lot of "@comment MD5:" lines.
#
{
- rcsid='$NetBSD: regpkg,v 1.20 2012/11/03 07:59:46 mbalmer Exp $'
+ rcsid='$NetBSD: regpkg,v 1.21 2014/05/24 13:27:13 uebayasi Exp $'
utcdate="$(${ENV_CMD} TZ=UTC LOCALE=C \
${DATE} '+%Y-%m-%d %H:%M')"
user="${USER:-root}"
@@ -803,7 +803,12 @@ create_syspkg_tgz()
/^@/ {next}
/^\.\// {print $0; next}
/./ {print "./" $0; next}' \
- <"${PLIST}" >"${spec1}"
+ <"${PLIST}" |
+ # Escape some characters to match the new mtree(8) format.
+ # C.f. usr.sbin/mtree/spec.c:vispath()
+ # XXX escape only '[' for now
+ vis -o -e '[' \
+ >"${spec1}"
# If metalog was specified, attributes from metalog override
# attributes in the file system. We also fake up an
