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

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index d60f692..71e0658 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
@@ -26,18 +28,20 @@ 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 -n "Use a /boot filesystem (strongly recommended)? [Y/n] " &&
+ read use_boot &&
  echo "Swap device will be $dev_swap" &&
- echo "mkfs is $mkfs"
+ echo "fs is $fs"
  echo "Chosen mirror is $mirror"
 }
 }}}
@@ -64,26 +68,32 @@ trivial.
 #######
 # install base
 
- apt-get install debootstrap kpartx &&
+ apt-get install debootstrap debian-archive-keyring kpartx &&
  if [ "$use_lvm" = "y" ]; then
-   lvcreate -L 128m -n "$guest"-boot /dev/"$vg" &&
-   lvcreate -L 4g -n "$guest"-root /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 "$dev_boot"1 &&
- $mkfs "$dev_root" &&
+ if [ "$use_boot" != "n" ] ; then
+   ( echo ',,L,*' | sfdisk -D "$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"
+ debootstrap --variant=minbase --keyring=/usr/share/keyrings/debian-archive-keyring.gpg squeeze . "$mirror"
 }}}
 
 And finalize the setup:
@@ -110,22 +120,36 @@ 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 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 &&
-device (hd0) $dev_boot
-root (hd0,0)
-setup (hd0)
-quit
+ chroot . apt-get install 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 &&
+  cat > etc/kernel-img.conf << EOF &&
+do_symlinks = no
+do_initrd = yes
 EOF
- # install a kernel image
- echo -e "do_symlinks = yes\nlink_in_boot = yes\ndo_initrd = yes" > etc/kernel-img.conf &&
- chroot . apt-get install linux-image-2.6-amd64
-
+  if [ "$use_boot" != "n" ] ; then
+    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 &&
+    sed -i -e "s#dev/`basename $dev_boot`1#dev/hda1#g" boot/grub/grub.cfg &&
+    rm -v dev/"`basename $dev_boot`" dev/"`basename $dev_boot`1"
+  else
+    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 &&
+  sed -i -e "s#dev/`basename $dev_root`#dev/vda#g" boot/grub/grub.cfg &&
+  rm -v boot/grub/device.map &&
+  rm -v dev/"`basename $dev_root`"
 }}}
 
 And a fstab and a boot loader config
@@ -134,28 +158,19 @@ 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 &&
-default 0
-timeout 5
-color cyan/blue white/blue
-
-### BEGIN AUTOMAGIC KERNELS LIST
-# kopt=root=UUID=$rootuuid ro
-
-## ## End Default Options ##
-title Debian
-root (hd0,0)
-kernel /vmlinuz root=UUID=$rootuuid ro
-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=$swapuuid    none            swap    sw              0       0
 EOF
+ if [ "$use_boot" != "n" ] ; then
+    bootuuid=`vol_id "$dev_boot"1  | awk -F= '$1=="ID_FS_UUID" {print $2}'` &&
+    echo "UUID=$bootuuid    /boot           $fs    defaults        0       2" >> etc/fstab
+ fi
  cat > etc/network/interfaces << EOF
 auto lo
 iface lo inet loopback
@@ -173,13 +188,20 @@ Maybe fix/setup networking properly:
 vi etc/network/interfaces
 }}}
 
+And set a password:
+{{{
+chroot . passwd
+}}}
+
 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"
 }}}