also fetch MANIFEST files for d-i

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index 5ebd3cae3cc9e808f7de88f1f02c5a54c764da8c..6ca0f76a096c516a7aa2a2e9f0daa56d4a3bff78 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -5,6 +5,7 @@ set -e
 # defaults
 RAM=512
 DISK=20
 # defaults
 RAM=512
 DISK=20

+STORAGE_POOL=default

 QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
 QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'


@@ -34,6 +35,22 @@ while [ -n "$1" ]; do
       esac
       IPADDRESS="$1"
       ;;
       esac
       IPADDRESS="$1"
       ;;

+    (-d|--dns)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --dns/-d needs IP address'
+        exit 1
+      fi
+      NAMESERVER="$1"
+      ;;
+    (-g|--gateway)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --gateway/-g needs IP address'
+        exit 1
+      fi
+      GATEWAY="$1"
+      ;;

     (-r|--ram)
       shift
       if [ -z "$1" ]; then
     (-r|--ram)
       shift
       if [ -z "$1" ]; then


@@ -50,6 +67,14 @@ while [ -n "$1" ]; do
       fi
       DISK="$1"
       ;;
       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
   esac
   shift
 done


@@ -69,7 +94,7 @@ hostname=${HOSTNAME%%.*} \
 domain=${HOSTNAME#*.}"
 
 if [ -n "$IPADDRESS" ]; then
 domain=${HOSTNAME#*.}"
 
 if [ -n "$IPADDRESS" ]; then

-  if [ -z "$GATEWAY" ]; then
+  if [ -z "$GATEWAY" ] && [ -x $(command -v ipcalc) ]; then

     # default to the first IP in the network
     GATEWAY=$(ipcalc $IPADDRESS | grep HostMin | awk '{print $2}')
   fi
     # default to the first IP in the network
     GATEWAY=$(ipcalc $IPADDRESS | grep HostMin | awk '{print $2}')
   fi


@@ -83,15 +108,24 @@ if [ -n "$IPADDRESS" ]; then
   netcfg/get_gateway=$GATEWAY \
   netcfg/get_nameservers=$NAMESERVER"
 
   netcfg/get_gateway=$GATEWAY \
   netcfg/get_nameservers=$NAMESERVER"
 

+  BRIDGE=wan
+

 else
   extra_args="$extra_args netcfg/disable_dhcp=false"
 else
   extra_args="$extra_args netcfg/disable_dhcp=false"

+  BRIDGE=virt-br
+fi
+
+if [ -z "$ARCH" ]; then
+  ARCH=$(dpkg --print-architecture)

 fi
 
 cat >&2 <<_eof
   hostname: $HOSTNAME
 fi
 
 cat >&2 <<_eof
   hostname: $HOSTNAME

+      arch: $ARCH

        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE
        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE

+net bridge: $BRIDGE

 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof


@@ -106,13 +140,16 @@ else
 _eof
 fi
 
 _eof
 fi
 

-exit 0
+echo >&2

 
 

-exec virt-install --connect=$QEMU_URI \
+set -v
+virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
+
+virt-install --connect=$QEMU_URI \

   -n $HOSTNAME \
   -r $RAM \
   -n $HOSTNAME \
   -r $RAM \

-  --disk pool=default,size=$SIZE \
-  -w bridge=virt-br \
+  --disk vol=$STORAGE_POOL/virt-$HOSTNAME \
+  -w bridge=$BRIDGE \

   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \


@@ -120,6 +157,9 @@ exec virt-install --connect=$QEMU_URI \
   -l $BASEDIR/installer-amd64 \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
   -l $BASEDIR/installer-amd64 \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \

+  --prompt --noautoconsole --autostart \

   --extra-args="$extra_args" \
   --extra-args="$extra_args" \

-  --autostart \

   "$@"
   "$@"

+
+virsh --connect=$QEMU_URI console $HOSTNAME
+virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"