X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=input%2Fhowto%2Finstall-kvm.creole;h=71e0658bd4d93e7cc7b5d8426b18dc36efe083e6;hb=4fae6a459ad0028516f6fbcd5fff4a45ff9de96d;hp=5c32e5aa16c6eec302e034d81823d5b5ee1df0d9;hpb=4c5c3d25fd44e615ef978f5490d5ecd0f01ba42a;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index 5c32e5a..71e0658 100644
--- a/input/howto/install-kvm.creole
+++ b/input/howto/install-kvm.creole
@@ -121,21 +121,18 @@ 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 &&
- cp -av $dev_root dev/ &&
+ cp -av `readlink -f $dev_root` dev/`basename $dev_root` &&
  DEBIAN_FRONTEND=noninteractive chroot . apt-get install grub2 &&
   cat > etc/kernel-img.conf << EOF &&
 do_symlinks = no
 do_initrd = yes
-EOF
- # install a kernel image
- chroot . apt-get install linux-image-2.6-amd64 &&
- cat >> etc/kernel-img.conf << EOF &&
-postinst_hook = update-grub
-postrm_hook   = update-grub
 EOF
   if [ "$use_boot" != "n" ] ; then
-    cp -av $dev_boot $dev_boot""1 dev/ &&
+    cp -av `readlink -f $dev_boot` dev/`basename $dev_boot` &&
+    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 &&
     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 &&
@@ -145,6 +142,8 @@ EOF
     echo && echo && echo && echo "Hardly tested, expect this to fail." && echo && echo && echo &&
     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 &&
     sed -i -e 's/^#GRUB_TERMINAL=console/GRUB_TERMINAL=console/' etc/default/grub &&
     chroot . update-grub
   fi &&