Changed xen.lvm -> lvm

[invirt/scripts/invirt-admin.git] / invirt-admin

diff --git a/invirt-admin b/invirt-admin
index 64b02ee..477e625 100755 (executable)
--- a/invirt-admin
+++ b/invirt-admin
@@ -8,6 +8,8 @@ usage () {
     echo "  required options: --name, --fs-size, --swap-size, --memory,"
     echo "    --hostname, --ip, --mac, --arch, --dist, --mirror"
     echo
     echo "  required options: --name, --fs-size, --swap-size, --memory,"
     echo "    --hostname, --ip, --mac, --arch, --dist, --mirror"
     echo

+    echo "  optional options: --netmask, --gateway.  Defaults will be pulled from invirt-getconf"
+    echo

     echo "  fs-size, swap-size, memory in MiB"
     echo "  fs-size + swap-size will be total disk-image size"
     exit 2
     echo "  fs-size, swap-size, memory in MiB"
     echo "  fs-size + swap-size will be total disk-image size"
     exit 2

@@ -18,7 +20,7 @@ if [ create-sysvm != "$1" ]; then
 fi
 shift
 
 fi
 shift
 

-vg=xenvg
+vg=$(invirt-getconf lvm.vg)

 while [ $# -gt 0 ]; do
     case "$1" in
        --vg)        vg=$2;        shift 2;;
 while [ $# -gt 0 ]; do
     case "$1" in
        --vg)        vg=$2;        shift 2;;

@@ -32,6 +34,8 @@ while [ $# -gt 0 ]; do
        --arch)      arch=$2;      shift 2;;
        --dist)      dist=$2;      shift 2;;
        --mirror)    mirror=$2;    shift 2;;
        --arch)      arch=$2;      shift 2;;
        --dist)      dist=$2;      shift 2;;
        --mirror)    mirror=$2;    shift 2;;

+       --netmask)   netmask=$2;   shift 2;;
+       --gateway)   gateway=$2;   shift 2;;

         *)
             echo "Unknown option: $1"
             echo
         *)
             echo "Unknown option: $1"
             echo

@@ -51,6 +55,7 @@ lvcreate "$vg" --name "s_${name}_hda" --size "$disk_size"m
 TARGET=/dev/mapper/$vg-s_${name}_hda FSSIZE=$fs_size \
 ARCH=$arch DIST=$dist MIRROR=$mirror \
 HOSTNAME=$hostname IP=$ip \
 TARGET=/dev/mapper/$vg-s_${name}_hda FSSIZE=$fs_size \
 ARCH=$arch DIST=$dist MIRROR=$mirror \
 HOSTNAME=$hostname IP=$ip \

+NETMASK=$netmask GATEWAY=$gateway \

  invirt-create-image 
 
 cat >/etc/xen/sysvms/s_$name <<EOF
  invirt-create-image 
 
 cat >/etc/xen/sysvms/s_$name <<EOF