projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34751cc
)
Support supplying an alternate keyring
author
Peter Palfrader
<peter@palfrader.org>
Wed, 8 May 2013 08:57:32 +0000
(10:57 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Fri, 10 May 2013 12:22:36 +0000
(14:22 +0200)
modules/porterbox/files/setup-dchroot
patch
|
blob
|
history
diff --git
a/modules/porterbox/files/setup-dchroot
b/modules/porterbox/files/setup-dchroot
index
e741b2d
..
db098d1
100755
(executable)
--- a/
modules/porterbox/files/setup-dchroot
+++ b/
modules/porterbox/files/setup-dchroot
@@
-39,9
+39,10
@@
OPTIONS:
-a ARCH debootstrap arch [$arch]
-m MIRROR http mirror to use [$mirror]
-b basedir place where to build the chroot/tarball [$basedir]
-a ARCH debootstrap arch [$arch]
-m MIRROR http mirror to use [$mirror]
-b basedir place where to build the chroot/tarball [$basedir]
- -f overwrite stuff.
- -c write config only.
- -h this help.
+ -c write config only
+ -f overwrite config and target tarball
+ -k KEYRING use an alternate keyring [$keyring]
+ -h this help
EOF
}
EOF
}
@@
-121,10
+122,11
@@
mirror="${mirror:-http://cdn.debian.net/debian}"
configonly=""
force=""
basedir="/srv/chroot"
configonly=""
force=""
basedir="/srv/chroot"
+keyring=/usr/share/keyrings/debian-archive-keyring.gpg
declare -a cleanup
trap do_cleanup EXIT
declare -a cleanup
trap do_cleanup EXIT
-while getopts "a:b:cfhm:" OPTION
+while getopts "a:b:cfh
k:
m:" OPTION
do
case $OPTION in
a)
do
case $OPTION in
a)
@@
-143,6
+145,9
@@
do
help
exit 0
;;
help
exit 0
;;
+ k)
+ keyring="$OPTARG"
+ ;;
m)
mirror="$OPTARG"
;;
m)
mirror="$OPTARG"
;;
@@
-183,7
+188,7
@@
cleanup+=("umount $rootdir/sys")
set -x
debootstrap \
set -x
debootstrap \
- --keyring
/usr/share/keyrings/debian-archive-keyring.gpg
\
+ --keyring
"$keyring"
\
--include="apt" \
--variant=buildd \
--arch="$arch" \
--include="apt" \
--variant=buildd \
--arch="$arch" \