X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Finstall-kvm.creole;h=1d87b2a0d6f0c0eaeb034776f8ebc1838ccf657f;hb=b0b091134d88398845e8bc7fe0698a92fdf816c3;hp=5dcfbb42142eefb858af1ed6d7e269e0568b6b12;hpb=0b1512431356d06e225da10a8334e13c99624229;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index 5dcfbb4..1d87b2a 100644
--- a/input/howto/install-kvm.creole
+++ b/input/howto/install-kvm.creole
@@ -14,8 +14,10 @@ setup_env() {
  read guest &&
  target=/mnt/target &&
  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" &&
+ vgdefault=`vgdisplay -c | awk -F: '{print $1;exit}' | sed 's/ *//g'` &&
+ echo -n "Volume group? [$vgdefault]: " &&
+ read vg &&
+ if [ "$vg" = "" ]; then vg="$vgdefault"; fi &&
  echo -n "Use lvm for non-swap partitions? [Y/n] " &&
  read use_lvm &&
  if [ "$use_lvm" = "n" ]; then
@@ -36,6 +38,8 @@ setup_env() {
    fs=ext3
  fi &&
  dev_swap="/dev/mapper/$vg-$guest--swap" &&
+ echo -n "Use a /boot filesystem? [Y/n] " &&
+ read use_boot &&
  echo "Swap device will be $dev_swap" &&
  echo "fs is $fs"
  echo "Chosen mirror is $mirror"
@@ -66,21 +70,27 @@ trivial.
 
  apt-get install debootstrap kpartx &&
  if [ "$use_lvm" = "y" ]; then
-   lvcreate -L 128m -n "$guest"-boot /dev/"$vg" &&
+   if [ "$use_boot" != "n" ] ; then
+     lvcreate -L 128m -n "$guest"-boot /dev/"$vg"
+   fi &&
    lvcreate -L 4g -n "$guest"-root /dev/"$vg"
  fi &&
- lvcreate -L 4g -n "$guest"-swap /dev/"$vg"
+ lvcreate -L 4g -n "$guest"-swap /dev/"$vg" &&
  : &&
- ( echo ',,L,*' | sfdisk "$dev_boot" ) &&
- kpartx -v -a "$dev_boot" &&
- mkfs."$fs" "$dev_boot"1 &&
+ if [ "$use_boot" != "n" ] ; then
+   ( echo ',,L,*' | sfdisk "$dev_boot" ) &&
+   kpartx -v -a "$dev_boot" &&
+   mkfs."$fs" "$dev_boot"1
+ fi &&
  mkfs."$fs" "$dev_root" &&
  mkswap "$dev_swap" &&
  : &&
  mkdir -p "$target" &&
  mount "$dev_root" "$target" &&
- mkdir -p "$target/boot" &&
- mount "$dev_boot"1 "$target/boot" &&
+ if [ "$use_boot" != "n" ] ; then
+   mkdir -p "$target/boot" &&
+   mount "$dev_boot"1 "$target/boot"
+ fi &&
 
  cd "$target" &&
  debootstrap --variant=minbase lenny . "$mirror"
@@ -111,27 +121,45 @@ EOF
  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 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
- chroot . apt-get install grub &&
- cp -av usr/lib/grub/x86_64-pc boot/grub &&
- grub << EOF &&
+ if [ "$use_boot" != "n" ] ; then
+   chroot . apt-get install grub &&
+   cp -av usr/lib/grub/x86_64-pc boot/grub &&
+   grub << EOF &&
 device (hd0) $dev_boot
 root (hd0,0)
 setup (hd0)
 quit
 EOF
- # install a kernel image
- cat > etc/kernel-img.conf << EOF &&
+   # install a kernel image
+   cat > etc/kernel-img.conf << EOF &&
 do_symlinks = yes
 link_in_boot = yes
 do_initrd = yes
+EOF
+   chroot . apt-get install linux-image-2.6-amd64 &&
+   cat >> etc/kernel-img.conf << EOF
 postinst_hook = /usr/sbin/update-grub
 postrm_hook   = /usr/sbin/update-grub
 EOF
- chroot . apt-get install linux-image-2.6-amd64
-
+  else
+    cat > etc/kernel-img.conf << EOF &&
+do_symlinks = no
+do_initrd = yes
+EOF
+    chroot . apt-get install linux-image-2.6-amd64 &&
+   cat >> etc/kernel-img.conf << EOF
+postinst_hook = update-grub
+postrm_hook   = update-grub
+EOF
+    chroot . apt-get install grub2 &&
+    cp -av $dev_root dev/ &&
+    echo "(hd0) /dev/`basename $dev_root`" > boot/grub/device.map &&
+    chroot . grub-install /dev/"`basename $dev_root`" &&
+    sed -i -e 's/^#GRUB_TERMINAL=console/GRUB_TERMINAL=console/' etc/default/grub &&
+    chroot . update-grub &&
+    rm -v dev/"`basename $dev_root`" boot/grub/device.map &&
+    sed -i -e "s#dev/`basename $dev_root`#dev/vda#g" boot/grub/grub.cfg
+  fi
 }}}
 
 And a fstab and a boot loader config
@@ -140,8 +168,9 @@ And a fstab and a boot loader config
  # doesn't work: chroot . update-grub
  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 &&
+ if [ "$use_boot" != "n" ] ; then
+   bootuuid=`vol_id "$dev_boot"1  | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
+   cat > boot/grub/menu.lst << EOF
 default 0
 timeout 5
 color cyan/blue white/blue
@@ -157,6 +186,7 @@ initrd /initrd.img
 
 ### END DEBIAN AUTOMAGIC KERNELS LIST
 EOF
+ fi &&
  if [ "$fs" = "ext3" ]; then
    rootopts="errors=remount-ro"
  else
@@ -164,9 +194,11 @@ EOF
  fi
  cat > etc/fstab << EOF &&
 UUID=$rootuuid    /               $fs    $rootopts 0       1
-UUID=$bootuuid    /boot           $fs    defaults        0       2
 UUID=$swapuuid    none            swap    sw              0       0
 EOF
+ if [ "$use_boot" != "n" ] ; then
+    echo "UUID=$bootuuid    /boot           $fs    defaults        0       2" >> etc/fstab
+ fi
  cat > etc/network/interfaces << EOF
 auto lo
 iface lo inet loopback
@@ -188,9 +220,11 @@ And unmount:
 
 {{{
   cd / &&
- umount "$target"/boot &&
+ if [ "$use_boot" != "n" ] ; then
+   umount "$target"/boot &&
+   kpartx -v -d "$dev_boot"
+ fi &&
  umount "$target" &&
- kpartx -v -d "$dev_boot" &&
  rmdir "$target"
 }}}