From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 6 Jan 2012 12:05:13 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=71276bb00d80d4169cbfa2b07e508a3f11e7c05b;hp=61b2dd06348a9b3866ec8bcbeaec74ac7d6ecf8a;p=mirror%2Fdsa-wiki.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Fix path to libvirt xml files
  Document /SWAPFILES in script
---

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index 02903e4..aa8051c 100644
--- a/input/howto/install-kvm.creole
+++ b/input/howto/install-kvm.creole
@@ -37,7 +37,13 @@ setup_env() {
    echo "Boot device will be $dev_boot" &&
    fs=ext4
  fi &&
- dev_swap="/dev/mapper/$vg-$guest--swap" &&
+ if [ "$vg" != "" ]; then
+   dev_swap="/dev/mapper/$vg-$guest--swap"
+ elif [ -d /SWAPFILES ]; then
+   dev_swap=/SWAPFILES/$guest-swap
+ else
+   echo "No idea how to do swap" && false
+ fi &&
  echo -n "Use a /boot filesystem (strongly recommended)? [Y/n] " &&
  read use_boot &&
  echo "Swap device will be $dev_swap" &&
@@ -207,7 +213,7 @@ And unmount:
 
 === virsh setup ===
 
-Setup a new kvm domain by creating a new file in /etc/da-virt/`hostname/$guest.xml.
+Setup a new kvm domain by creating a new file in /etc/dsa-kvm/`hostname/$guest.xml.
 
 * Properly configure hostname
 * Pick a new uuid ({{{uuidgen}}})