From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 20 Dec 2009 07:47:18 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/srv/db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a505fa8f920c61738eec57e96bbc6ff2a2e01542;hp=df33b3c3b5667c19713946c63e5f40be8b90876f;p=mirror%2Fdsa-wiki.git

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

diff --git a/input/howto/install-kvm.creole b/input/howto/install-kvm.creole
index 1d87b2a..7f1bbb8 100644
--- a/input/howto/install-kvm.creole
+++ b/input/howto/install-kvm.creole
@@ -68,7 +68,7 @@ trivial.
 #######
 # install base
 
- apt-get install debootstrap kpartx &&
+ apt-get install debootstrap debian-archive-keyring kpartx &&
  if [ "$use_lvm" = "y" ]; then
    if [ "$use_boot" != "n" ] ; then
      lvcreate -L 128m -n "$guest"-boot /dev/"$vg"
@@ -93,7 +93,7 @@ trivial.
  fi &&
 
  cd "$target" &&
- debootstrap --variant=minbase lenny . "$mirror"
+ debootstrap --variant=minbase --keyring=/usr/share/keyrings/debian-archive-keyring.gpg lenny . "$mirror"
 }}}
 
 And finalize the setup: