Install Debian and Ubuntu kernels without checking to see what the VM

is running

svn path=/trunk/packages/invirt-autoinstaller/; revision=1722

diff --git a/common/usr/lib/xen-tools/debian.d/97-setup-grub b/common/usr/lib/xen-tools/debian.d/97-setup-grub
index 28555a6..2539e6b 100755 (executable)
--- a/common/usr/lib/xen-tools/debian.d/97-setup-grub
+++ b/common/usr/lib/xen-tools/debian.d/97-setup-grub
@@ -24,19 +24,9 @@ logMessage Script $0 starting
 # Install the xen kernel.  linux-image-xen is in ubuntu,
 # linux-image-xen-{amd64,686} in debian.
 #
 # Install the xen kernel.  linux-image-xen is in ubuntu,
 # linux-image-xen-{amd64,686} in debian.
 #

-
-# First we need to figure out whether we're dealing with Debian or
-# Ubuntu. Unfortunately, Debian doesn't install lsb_release by
-# default, and its lsb-release package Recommends a bunch of stuff
-installDebianPackage ${prefix} -o="Apt::Install-Recommends=false" lsb-release
-if [ "Debian" = "$(chroot ${prefix} lsb_release -si)" ]; then
-    # One of these exists in the amd64 repo, and one of them exists in
-    # the i386 repo. The one that doesn't exist won't get installed
-    installDebianPackage ${prefix} linux-image-xen-amd64
-    installDebianPackage ${prefix} linux-image-xen-686
-else
-    installDebianPackage ${prefix} linux-image-xen
-fi
+installDebianPackage ${prefix} linux-image-xen-amd64
+installDebianPackage ${prefix} linux-image-xen-686
+installDebianPackage ${prefix} linux-image-xen

 
 installDebianPackage ${prefix} grub
 
 
 installDebianPackage ${prefix} grub
 

diff --git a/debian/changelog b/debian/changelog
index a407d87..2b79374 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-autoinstaller (0.0.5) unstable; urgency=low
+
+  * Install Debian and Ubuntu compatible kernels without checking first
+
+ -- Evan Broder <broder@mit.edu>  Wed, 19 Nov 2008 20:51:20 -0500
+

 invirt-autoinstaller (0.0.4) unstable; urgency=low
 
   * Figure out whether the autoinstaller is running on Debian or Ubuntu,
 invirt-autoinstaller (0.0.4) unstable; urgency=low
 
   * Figure out whether the autoinstaller is running on Debian or Ubuntu,