add installer-i386 and enable --arch specification

diff --git a/di-update b/di-update
index 22c0d56b2ceffb6244b9b8f5f2489996666d84fd..c64224da9017fedc414f7feca58110211134b0d1 100755 (executable)
--- a/di-update
+++ b/di-update
@@ -3,5 +3,11 @@ set -eu
 
 MIRROR=ftp://ftp2.de.debian.org/debian
 
-cd installer-amd64
-exec wget -c -np -nH -m --cut-dirs=5 $MIRROR/dists/wheezy/main/installer-amd64/current/images/netboot
+cd ${0%/*}
+BASEDIR=$PWD
+
+for arch in amd64 i386; do
+  mkdir --parent $BASEDIR/installer-${arch}
+  cd $BASEDIR/installer-${arch}
+  wget -c -np -nH -m --cut-dirs=5 $MIRROR/dists/wheezy/main/installer-${arch}/current/images/netboot
+done

diff --git a/installer-i386/.backup-filter b/installer-i386/.backup-filter
new file mode 100644 (file)
index 0000000..5dd3908
--- /dev/null
+++ b/installer-i386/.backup-filter
@@ -0,0 +1 @@
+- *

diff --git a/installer-i386/.gitignore b/installer-i386/.gitignore
new file mode 100644 (file)
index 0000000..be754d7
--- /dev/null
+++ b/installer-i386/.gitignore
@@ -0,0 +1,3 @@
+*
+!/.gitignore
+!/.backup-filter

diff --git a/vinst b/vinst
index 51a87e9d667ae65e920ce8f496b58afc82e023ee..6ca0f76a096c516a7aa2a2e9f0daa56d4a3bff78 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -67,6 +67,14 @@ while [ -n "$1" ]; do
       fi
       DISK="$1"
       ;;
+    (-a|--arch)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --arch/-a needs size argument'
+        exit 1
+      fi
+      ARCH="$1"
+      ;;
   esac
   shift
 done
@@ -107,8 +115,13 @@ else
   BRIDGE=virt-br
 fi
 
+if [ -z "$ARCH" ]; then
+  ARCH=$(dpkg --print-architecture)
+fi
+
 cat >&2 <<_eof
   hostname: $HOSTNAME
+      arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE
@@ -127,6 +140,7 @@ else
 _eof
 fi
 
+echo >&2
 
 set -v
 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G