Changeset 938 for trunk

Timestamp:

Sep 28, 2008, 8:16:05 PM (16 years ago)

Author:

price

Message:

sipb-xen-install deals with lvcreate, and some tweaks

Location:

trunk/packages/sipb-xen-autoinstaller

Files:

• common/usr/sbin/sipb-xen-create-image (modified) (3 diffs)
• guest/etc/init.d/rcS.sipb-xen (modified) (1 diff)
• host/usr/sbin/sipb-xen-install (modified) (2 diffs)

trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image

@@ -3 +3 @@
 # "arguments" come in environment:
 #  TARGET a device filename
-#  IMAGESIZE the desired filesystem size in megabytes (rest will be swap)
+#  FSSIZE the desired filesystem size in megabytes (rest will be swap)
 #  ARCH, DIST, MIRROR
 #  HOSTNAME, IP
@@ -9 +9 @@
 set -e
 
-echo ,"${IMAGESIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
+echo ,"${FSSIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
 
 kpartx -a "$TARGET"    # should be no-op in guest
@@ -17 +17 @@
  --arch "$ARCH" --dist "$DIST" --mirror "$MIRROR" --cache=yes
 
-kpartx -d $VOLUME
+kpartx -d "$TARGET"
 
 exit 0

trunk/packages/sipb-xen-autoinstaller/guest/etc/init.d/rcS.sipb-xen

@@ -15 +15 @@
         ;;
         imagesize=*)
-        export IMAGESIZE=${x#imagesize=}
+        export FSSIZE=${x#imagesize=}
         ;;
         noinstall)

trunk/packages/sipb-xen-autoinstaller/host/usr/sbin/sipb-xen-install

@@ -5 +5 @@
 # Unmount it, then kpartx -d $TARGET to clean up.
 
+set -e
+
 export PATH #WTF?
 
-LVNAME="$1"
+NAME="$1"
 export HOSTNAME="$2"
 export DIST="$3"
 export MIRROR="$4"
-export IMAGESIZE="$5"  # in megabytes
-export IP="$6"
+export FSSIZE="$5"    # in megabytes
+SWAPSIZE="$6"  # in megabytes
+export IP="$7"
 
 export ARCH=amd64
+VGNAME=xenvg
 
 #LVSIZE=`lvs --noheadings --units M --nosuffix -o Size /dev/xenvg/d_foobar_hda | sed 's/\..*//'`
@@ -22 +26 @@
 fi
 
-export TARGET=/dev/mapper/xenvg-$(echo "$LVNAME" | sed -e 's/-/--/g')_hda
+/sbin/lvcreate -L $(($FSSIZE+$SWAPSIZE))M -n "${NAME}_hda" $VGNAME
+
+export TARGET=/dev/mapper/xenvg-"$(echo "${NAME}_hda" | sed -e 's/-/--/g')"
 
 /usr/sbin/sipb-xen-create-image
-