per guest target dir for installs

[mirror/dsa-wiki.git] / input / howto / install-kvm.creole

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index 20752e7..02903e4 100644 (file)
--- a/input/howto/install-kvm.creole
+++ b/input/howto/install-kvm.creole
@@ -12,7 +12,7 @@ setup_env() {
  echo -n "New hostname: " &&
  export LC_ALL=C &&
  read guest &&
- target=/mnt/target &&
+ target="/mnt/target-$guest" &&
  mirror=`cat /etc/apt/sources.list /etc/apt/sources.list.d/debian.list 2>/dev/null | awk '/^deb.*debian/ {print $2; exit}'` &&
  vgdefault=`vgdisplay -c | awk -F: '{print $1;exit}' | sed 's/ *//g'` &&
  echo -n "Volume group? [$vgdefault]: " &&
@@ -35,7 +35,7 @@ setup_env() {
    dev_boot="/dev/mapper/$vg-$guest--boot" &&
    echo "Root device will be $dev_root" &&
    echo "Boot device will be $dev_boot" &&
-   fs=ext3
+   fs=ext4
  fi &&
  dev_swap="/dev/mapper/$vg-$guest--swap" &&
  echo -n "Use a /boot filesystem (strongly recommended)? [Y/n] " &&
@@ -116,13 +116,13 @@ EOF
  rm -fv etc/apt/sources.list &&
  ( ! [ -e /etc/apt/sources.list ] || cp /etc/apt/sources.list etc/apt/sources.list)
  (cp -v /etc/apt/sources.list.d/* etc/apt/sources.list.d/ || true ) &&
- cp -v /etc/apt/preferences etc/apt/ &&
+ ( ! [ -e /etc/apt/preferences ] || cp -v /etc/apt/preferences etc/apt/ ) &&
  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 xfsprogs &&
+ chroot . apt-get install -y net-tools iproute ifupdown dialog vim netbase xfsprogs &&
  cp -av `readlink -f $dev_root` dev/`basename $dev_root` &&
- DEBIAN_FRONTEND=noninteractive chroot . apt-get install grub2 &&
+ DEBIAN_FRONTEND=noninteractive chroot . apt-get install -y grub2 &&
   cat > etc/kernel-img.conf << EOF &&
 do_symlinks = no
 do_initrd = yes
@@ -132,7 +132,7 @@ EOF
     cp -av `readlink -f $dev_boot""1` dev/`basename $dev_boot`1 &&
     chroot . grub-install --modules=part_msdos /dev/`basename $dev_boot` &&
     # install a kernel image
-    chroot . apt-get install linux-image-2.6-amd64 &&
+    chroot . apt-get install -y linux-image-2.6-amd64 &&
     sed -i -e 's/^#GRUB_TERMINAL=console/GRUB_TERMINAL=console/' etc/default/grub &&
     echo "(hd0) /dev/`basename $dev_boot`" > boot/grub/device.map &&
     chroot . update-grub &&
@@ -143,7 +143,7 @@ EOF
     echo "(hd0) /dev/`basename $dev_root`" > boot/grub/device.map &&
     chroot . grub-install /dev/"`basename $dev_root`" &&
     # install a kernel image
-    chroot . apt-get install linux-image-2.6-amd64 &&
+    chroot . apt-get install -y linux-image-2.6-amd64 &&
     sed -i -e 's/^#GRUB_TERMINAL=console/GRUB_TERMINAL=console/' etc/default/grub &&
     chroot . update-grub
   fi &&
@@ -158,7 +158,7 @@ And a fstab and a boot loader config
  # doesn't work: chroot . update-grub
  rootuuid=`blkid -s UUID -o value "$dev_root"` &&
  swapuuid=`blkid -s UUID -o value "$dev_swap"` &&
- if [ "$fs" = "ext3" ]; then
+ if [ "$fs" = "ext4" ]; then
    rootopts="errors=remount-ro"
  else
    rootopts="defaults"