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:
065ba23
)
Also extract arch info from schroot name
author
Peter Palfrader
<peter@palfrader.org>
Wed, 6 May 2015 06:02:56 +0000
(08:02 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 6 May 2015 06:08:35 +0000
(08:08 +0200)
modules/schroot/files/schroot-dsa/config
patch
|
blob
|
history
diff --git
a/modules/schroot/files/schroot-dsa/config
b/modules/schroot/files/schroot-dsa/config
index
688f8b6
..
25d36b1
100644
(file)
--- a/
modules/schroot/files/schroot-dsa/config
+++ b/
modules/schroot/files/schroot-dsa/config
@@
-20,14
+20,18
@@
if [ "$CHROOT_SESSION_PURGE" = "true" ]; then
case $CHROOT_DESCRIPTION in
"["*-*_*-dchroot"]"*)
chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
case $CHROOT_DESCRIPTION in
"["*-*_*-dchroot"]"*)
chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
- suitevariant_arch_tuple="${chroot_type%%-dchroot
-*
}"
+ suitevariant_arch_tuple="${chroot_type%%-dchroot}"
suitevariant=${suitevariant_arch_tuple%_*}
suitevariant=${suitevariant_arch_tuple%_*}
+ SUITE_ARCH=${suitevariant_arch_tuple##*_}
SUITE_BASE=${suitevariant%-*}
SUITE_VARIANT=${suitevariant##*-}
;;
"["*_*-dchroot"]"*)
chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
SUITE_BASE=${suitevariant%-*}
SUITE_VARIANT=${suitevariant##*-}
;;
"["*_*-dchroot"]"*)
chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
- SUITE_BASE="${chroot_type%%_*}"
+ suite_arch_tuple="${chroot_type%%-dchroot}"
+ SUITE_ARCH=${suite_arch_tuple##*_}
+ SUITE_BASE="${suite_arch_tuple%%_*}"
+ SUITE_VARIANT=""
;;
*)
if [ "$STAGE" = "setup-start" ]; then
;;
*)
if [ "$STAGE" = "setup-start" ]; then