Changeset 1719 for trunk

Timestamp:

Nov 19, 2008, 8:05:15 PM (16 years ago)

Author:

broder

Message:

Install the right kernel on both Debian and Ubuntu - both 32 and 64 bit

Location:

trunk/packages/invirt-autoinstaller

Files:

• common/usr/lib/xen-tools/debian.d/97-setup-grub (modified) (1 diff)
• debian/changelog (modified) (1 diff)

trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/97-setup-grub

@@ -23 +23 @@
 #
 # Install the xen kernel.  linux-image-xen is in ubuntu,
-# linux-image-xen-amd64 in debian.
-installDebianPackage ${prefix} linux-image-xen
-installDebianPackage ${prefix} linux-image-xen-amd64
+# 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} grub

trunk/packages/invirt-autoinstaller/debian/changelog

@@ +1 @@
+invirt-autoinstaller (0.0.4) unstable; urgency=low
+
+  * Figure out whether the autoinstaller is running on Debian or Ubuntu,
+    and install an appropriate kernel
+
+ -- Evan Broder <broder@mit.edu>  Wed, 19 Nov 2008 19:53:25 -0500
+
 invirt-autoinstaller (0.0.3) unstable; urgency=low