integrate /usr with /

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index 6b6ca5dc60ef4009f137f5fcba3ee09e1e70d0f0..695ae17f07af6ab7d07f5b5bfbf814b143a0fe5d 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -15,6 +15,17 @@ RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
 
 while [ -n "$1" ]; do
   case "$1" in

+    (--debug)
+      DEBUG=1
+      ;;
+    (-S|--suite)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --suite/-S needs suite argument'
+        exit 1
+      fi
+      SUITE="$1"
+      ;;

     (-n|--name)
       shift
       if [ -z "$1" ]; then
     (-n|--name)
       shift
       if [ -z "$1" ]; then


@@ -110,10 +121,15 @@ BASEDIR=$(cd ${0%/*}; pwd)
 tmpdir=$(mktemp -d)
 tar -C $BASEDIR/preseed/$SUITE -cf $tmpdir/commands.tar commands
 
 tmpdir=$(mktemp -d)
 tar -C $BASEDIR/preseed/$SUITE -cf $tmpdir/commands.tar commands
 

-extra_args="auto $CONSOLE \
+extra_kargs="auto $CONSOLE \

 hostname=${HOSTNAME%%.*} \
 domain=${HOSTNAME#*.}"
 
 hostname=${HOSTNAME%%.*} \
 domain=${HOSTNAME#*.}"
 

+extra_opts=
+if [ -n "$DEBUG" ]; then
+  extra_opts='--debug'
+fi
+

 if [ -n "$IPADDRESS" ]; then
   if [ -z "$GATEWAY" ] && [ -x $(command -v ipcalc) ]; then
     # default to the first IP in the network
 if [ -n "$IPADDRESS" ]; then
   if [ -z "$GATEWAY" ] && [ -x $(command -v ipcalc) ]; then
     # default to the first IP in the network


@@ -123,7 +139,7 @@ if [ -n "$IPADDRESS" ]; then
   IPADDRESS="${IPADDRESS%/*}"
   : ${NAMESERVER:=$GATEWAY}
 
   IPADDRESS="${IPADDRESS%/*}"
   : ${NAMESERVER:=$GATEWAY}
 

-  extra_args="$extra_args netcfg/disable_dhcp=true \
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=true \

   netcfg/get_ipaddress=$IPADDRESS \
   netcfg/get_netmask=$NETMASK \
   netcfg/get_gateway=$GATEWAY \
   netcfg/get_ipaddress=$IPADDRESS \
   netcfg/get_netmask=$NETMASK \
   netcfg/get_gateway=$GATEWAY \


@@ -132,7 +148,7 @@ if [ -n "$IPADDRESS" ]; then
   BRIDGE=wan
 
 else
   BRIDGE=wan
 
 else

-  extra_args="$extra_args netcfg/disable_dhcp=false"
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=false"

   BRIDGE=virt-br
 fi
 
   BRIDGE=virt-br
 fi
 


@@ -148,6 +164,7 @@ fi
 cat >&2 <<_eof
   hostname: $HOSTNAME
       arch: $ARCH
 cat >&2 <<_eof
   hostname: $HOSTNAME
       arch: $ARCH

+     suite: $SUITE

        ram: $RAM MiB
       disk: $DISK GiB
       wipe: $WIPE
        ram: $RAM MiB
       disk: $DISK GiB
       wipe: $WIPE


@@ -191,12 +208,12 @@ virt-install --connect=$QEMU_URI \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \

-  --os-variant=debian$SUITE \
-  -l $BASEDIR/installer-amd64 \
+  --os-variant=debianwheezy \

   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \

-  --noautoconsole --autostart \
-  --extra-args="$extra_args" \
+  --extra-args="$extra_kargs" \
+  --prompt --noautoconsole --autostart $extra_opts \
+  -l $BASEDIR/installer-amd64/$SUITE \

   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME