X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-all-dchroots;h=ec98163d51d28a3e1ee658e3859ad57f7c4ed9a2;hb=b8e81a9814ac419978878af2da3ed785b02272f9;hp=2f5d710db88b2dfc121080ec58ed1cd127896724;hpb=2b38fef2d108fd7c24ba4f4f7df4e29ada1842db;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
index 2f5d710db..ec98163d5 100755
--- a/modules/schroot/files/setup-all-dchroots
+++ b/modules/schroot/files/setup-all-dchroots
@@ -28,9 +28,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-DPKGARCH=$(dpkg --print-architecture)
-UNAMEARCH=$(uname -m)
-
 get_suites() {
     case "$1" in
       amd64|i386|armel|armhf)
@@ -49,13 +46,13 @@ do_one() {
     case "$MODE" in
         buildd)
             mkdir -p /srv/buildd/unpack
-            if ! $SILENT setup-dchroot $extraargs -f -a "$a" -D -d '/srv/buildd/unpack' -K "$s"
+            if ! $SILENT setup-dchroot $EXTRAARGS -f -a "$a" -D -d '/srv/buildd/unpack' -K "$s"
             then
                 return 1
             fi
             ;;
         porterbox)
-            if ! $SILENT setup-dchroot $extraargs -f -a "$a" "$s"
+            if ! $SILENT setup-dchroot $EXTRAARGS -f -a "$a" "$s"
             then
                 return 1
             fi
@@ -73,22 +70,39 @@ cat << EOF
 usage: $0 [<options>] [buildd]
 
 OPTIONS:
+    -a <ARCH>  limit to ARCH
     -c         write config only
     -h         this help
+    -s <SUITE> limit to SUITE
 EOF
 }
 
-extraargs=""
-while getopts "cu" OPTION
+##########
+# "main"
+##########
+
+
+# parse options
+##########
+EXTRAARGS=""
+limitarch=""
+limitsuite=""
+while getopts "cha:s:" OPTION
 do
     case $OPTION in
+        a)
+            limitarch="$OPTARG"
+            ;;
         c)
-            extraargs="$extraargs -c"
+            EXTRAARGS="$EXTRAARGS -c"
             ;;
         h)
             usage
             exit 0
             ;;
+        s)
+            limitsuite="$OPTARG"
+            ;;
         *)
             usage >&2
             exit 1
@@ -97,6 +111,8 @@ do
 done
 shift $(($OPTIND - 1))
 
+# parse arguments
+##########
 if [ "$#" -gt 1 ]; then
     usage >&2
     exit 1
@@ -115,14 +131,18 @@ else
     MODE=porterbox
 fi
 
+# figure out whether to be verbose or not
+##########
 if [ -t 0 ] ; then
     SILENT=""
 else
     SILENT="chronic"
 fi
 
-
-archs="$DPKGARCH"
+# get list of archs based on dpkg architecture
+##########
+DPKGARCH=$(dpkg --print-architecture)
+archs="DPKGARCH"
 case "$DPKGARCH" in
     amd64)
         archs="$archs i386"
@@ -152,7 +172,9 @@ esac
 err=0
 
 for a in $archs; do
+    [ "$limitarch" != "" ] && [ "$limitarch" != "$a" ] && continue
     for s in `get_suites "$a"`; do
+        [ "$limitsuite" != "" ] && [ "$limitsuite" != "$s" ] && continue
         if ! do_one "$a" "$s"; then
             err=1
             echo >&2