Handle non-ext3 filesystems correctly

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index d60f692..b20b8e0 100644 (file)
--- a/input/howto/install-kvm.creole
+++ b/input/howto/install-kvm.creole
@@ -26,18 +26,18 @@ setup_env() {
    echo "Root device will be $dev_root" &&
    echo "Boot device will be $dev_boot" &&
    echo "Make sure they exist already." &&
-   mkfs=mkfs.xfs
+   fs=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
+   fs=ext3
  fi &&
  dev_swap="/dev/mapper/$vg-$guest--swap" &&
  echo "Swap device will be $dev_swap" &&
- echo "mkfs is $mkfs"
+ echo "fs is $fs"
  echo "Chosen mirror is $mirror"
 }
 }}}
@@ -73,8 +73,8 @@ trivial.
  : &&
  ( echo ',,L,*' | sfdisk "$dev_boot" ) &&
  kpartx -v -a "$dev_boot" &&
- $mkfs "$dev_boot"1 &&
- $mkfs "$dev_root" &&
+ mkfs."$fs" "$dev_boot"1 &&
+ mkfs."$fs" "$dev_root" &&
  mkswap "$dev_swap" &&
  : &&
  mkdir -p "$target" &&
@@ -110,7 +110,7 @@ EOF
  apt-key exportall | chroot . apt-key add - &&
  chroot . apt-get update &&
  echo "Apt::Install-Recommends 0;" > etc/apt/apt.conf.d/local-recommends &&
- chroot . apt-get install net-tools iproute ifupdown dialog vim netbase &&
+ chroot . apt-get install net-tools iproute ifupdown dialog vim netbase xfsprogs &&
  #chroot . apt-get remove --purge cpp dpkg-dev g++ gcc gcc-4.2-base libatm1 libdevmapper1.02.1 libgpm2 libc6-dev linux-libc-dev libstdc++6-4.3-dev binutils cpp-4.3 gcc-4.3 gettext-base libgmp3c2 libgomp1 libmpfr1ldbl libtimedate-perl
  # don't - it may start daemons
  #chroot . apt-get dist-upgrade
@@ -151,9 +151,14 @@ initrd /initrd.img
 
 ### END DEBIAN AUTOMAGIC KERNELS LIST
 EOF
+ if [ "$fs" = "ext3" ]; then
+   rootopts="errors=remount-ro"
+ else
+   rootopts="defaults"
+ fi
  cat > etc/fstab << EOF &&
-UUID=$rootuuid    /               ext3    errors=remount-ro 0       1
-UUID=$bootuuid    /boot           ext3    defaults        0       2
+UUID=$rootuuid    /               $fs    $rootopts 0       1
+UUID=$bootuuid    /boot           $fs    defaults        0       2
 UUID=$swapuuid    none            swap    sw              0       0
 EOF
  cat > etc/network/interfaces << EOF