Make more useful when we are not installing directly onto lvm LVs

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index e4c760d..357942e 100644 (file)
--- a/input/howto/install-kvm.creole
+++ b/input/howto/install-kvm.creole
@@ -16,6 +16,28 @@ setup_env() {
  mirror=`cat /etc/apt/sources.list /etc/apt/sources.list.d/debian.list 2>/dev/null | awk '/^deb.*debian/ {print $2; exit}'` &&
  vg=`vgdisplay -c | awk -F: '{print $1;exit}' | sed 's/ *//g'` &&
  echo "Chosen vg is $vg" &&
+ echo -n "Use lvm for non-swap partitions? [Y/n] " &&
+ read use_lvm &&
+ if [ "$use_lvm" = "n" ]; then
+   : SAN, as in the msa2012i at ubcece &&
+   : requires that it is already setup &&
+   dev_root="/dev/mapper/$guest-root" &&
+   dev_boot="/dev/mapper/$guest-boot" &&
+   echo "Root device will be $dev_root" &&
+   echo "Boot device will be $dev_boot" &&
+   echo "Make sure they exist already." &&
+   mkfs=mkfs.xfs
+ else
+   use_lvm="y" &&
+   dev_root="/dev/mapper/$vg-$guest--root" &&
+   dev_boot="/dev/mapper/$vg-$guest--boot" &&
+   echo "Root device will be $dev_root" &&
+   echo "Boot device will be $dev_boot" &&
+   mkfs=mkfs.ext3
+ fi &&
+ dev_swap="/dev/mapper/$vg-$guest--swap" &&
+ echo "Swap device will be $dev_swap" &&
+ echo "mkfs is $mkfs"
  echo "Chosen mirror is $mirror"
 }
 }}}
@@ -43,20 +65,22 @@ trivial.
 # install base
 
  apt-get install debootstrap kpartx &&
- lvcreate -L 128m -n "$guest"-boot /dev/"$vg" &&
- lvcreate -L 4g -n "$guest"-root /dev/"$vg" &&
- lvcreate -L 4g -n "$guest"-swap /dev/"$vg" &&
+ if [ "$use_lvm" = "y" ]; then
+   lvcreate -L 128m -n "$guest"-boot /dev/"$vg" &&
+   lvcreate -L 4g -n "$guest"-root /dev/"$vg" &&
+ fi &&
+ lvcreate -L 4g -n "$guest"-swap /dev/"$vg"
  : &&
- ( echo ',,L,*' | sfdisk /dev/"$vg"/"$guest"-boot ) &&
- kpartx -v -a /dev/"$vg"/"$guest"-boot &&
- mkfs.ext3 /dev/mapper/"$vg"-"$guest"--boot1 &&
- mkfs.ext3 /dev/"$vg"/"$guest"-root &&
- mkswap /dev/"$vg"/"$guest"-swap &&
+ ( echo ',,L,*' | sfdisk "$dev_boot" ) &&
+ kpartx -v -a "$dev_boot" &&
+ $mkfs "$dev_boot"1 &&
+ $mkfs "$dev_root" &&
+ mkswap "$dev_swap" &&
  : &&
  mkdir -p "$target" &&
- mount /dev/"$vg"/"$guest"-root "$target" &&
+ mount "$dev_root" "$target" &&
  mkdir -p "$target/boot" &&
- mount /dev/mapper/"$vg"-"$guest"--boot1 "$target/boot" &&
+ mount "$dev_boot"1 "$target/boot" &&
 
  cd "$target" &&
  debootstrap --variant=minbase lenny . "$mirror"
@@ -93,7 +117,7 @@ EOF
  chroot . apt-get install grub &&
  cp -av usr/lib/grub/x86_64-pc boot/grub &&
  grub << EOF &&
-device (hd0) /dev/mapper/$vg-$guest--boot
+device (hd0) $dev_boot
 root (hd0,0)
 setup (hd0)
 quit
@@ -108,9 +132,9 @@ And a fstab and a boot loader config
 
 {{{
  # doesn't work: chroot . update-grub
- rootuuid=`vol_id /dev/"$vg"/"$guest"-root "$target" | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
- swapuuid=`vol_id /dev/"$vg"/"$guest"-swap "$target" | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
- bootuuid=`vol_id /dev/mapper/"$vg"-"$guest"--boot1  | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
+ rootuuid=`vol_id "$dev_root" "$target" | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
+ swapuuid=`vol_id "$dev_swap" "$target" | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
+ bootuuid=`vol_id "$dev_boot"1  | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
  cat > boot/grub/menu.lst << EOF &&
 default 0
 timeout 5
@@ -155,13 +179,13 @@ And unmount:
   cd / &&
  umount "$target"/boot &&
  umount "$target" &&
- kpartx -v -d /dev/"$vg"/"$guest"-boot &&
+ kpartx -v -d "$dev_boot" &&
  rmdir "$target"
 }}}
 
 === virsh setup ===
 
-Setup a new kvm domain by creating a new file in /etc/dm-virt/`hostname/$guest.xml.
+Setup a new kvm domain by creating a new file in /etc/da-virt/`hostname/$guest.xml.
 
 * Properly configure hostname
 * Pick a new uuid ({{{uuidgen}}})
@@ -181,11 +205,11 @@ To get to the guest data from the host:
 
 {{{
   setup_env
- kpartx -v -a /dev/"$vg"/"$guest"-boot &&
+ kpartx -v -a "$dev_boot" &&
  mkdir -p "$target" &&
- mount /dev/"$vg"/"$guest"-root "$target" &&
+ mount "$dev_root" "$target" &&
  mkdir -p "$target/boot" &&
- mount /dev/mapper/"$vg"-"$guest"--boot1 "$target/boot"
+ mount "$dev_boot"1 "$target/boot"
 }}}
 
 and once you're done:
@@ -193,7 +217,7 @@ and once you're done:
  cd / &&
  umount "$target"/boot &&
  umount "$target" &&
- kpartx -v -d /dev/"$vg"/"$guest"-boot &&
+ kpartx -v -d "$dev_boot" &&
  rmdir "$target"
 }}}