From 599d602fabf5b0e92a7285c40f39413dd226ff52 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 26 Feb 2014 22:02:28 +0100 Subject: [PATCH] add installer-i386 and enable --arch specification --- di-update | 10 ++++++++-- installer-i386/.backup-filter | 1 + installer-i386/.gitignore | 3 +++ vinst | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 installer-i386/.backup-filter create mode 100644 installer-i386/.gitignore diff --git a/di-update b/di-update index 22c0d56..c64224d 100755 --- 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 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 index 0000000..be754d7 --- /dev/null +++ b/installer-i386/.gitignore @@ -0,0 +1,3 @@ +* +!/.gitignore +!/.backup-filter diff --git a/vinst b/vinst index 51a87e9..6ca0f76 100755 --- 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 -- 2.39.5