Don't hardcode netmask and gateway

[invirt/packages/invirt-autoinstaller.git] / common / usr / sbin / invirt-create-image

diff --git a/common/usr/sbin/invirt-create-image b/common/usr/sbin/invirt-create-image
index 2e71fde..a00561b 100644 (file)
--- a/common/usr/sbin/invirt-create-image
+++ b/common/usr/sbin/invirt-create-image
@@ -2,18 +2,28 @@
 # Usage: no command-line args.
 # "arguments" come in environment:
 #  TARGET a device filename
-#  FSSIZE the desired filesystem size in megabytes (rest will be swap)
+#  FSSIZE the desired filesystem size in mebibytes (rest will be swap)
 #  ARCH, DIST, MIRROR
 #  HOSTNAME, IP
+#
+# Optional: GATEWAY, NETMASK.  These default to values in invirt-getconf, if installed
 
 set -e
 
+if [ "$GATEWAY" = "" ]; then
+    GATEWAY=$(invirt-getconf autoinstaller.gateway)
+fi
+
+if [ "$NETMASK" = "" ]; then
+    NETMASK=$(invirt-getconf autoinstaller.netmask)
+fi
+
 echo ,"${FSSIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
 
 dmsetup info "$TARGET" 2>/dev/null && kpartx -a "$TARGET"
 
 xen-create-image --image-dev "${TARGET}1" --swap-dev "${TARGET}2" --fs ext3 --ide \
- --hostname "$HOSTNAME" --ip="$IP" --netmask=255.255.0.0 --gateway=18.181.0.1 \
+ --hostname "$HOSTNAME" --ip="$IP" --netmask="$NETMASK" --gateway="$GATEWAY" \
  --arch "$ARCH" --dist "$DIST" --mirror "$MIRROR" --cache=yes --verbose
 
 dmsetup info "$TARGET" 2>/dev/null && kpartx -d "$TARGET"