From: Richard W.M. Jones <rjones@redhat.com>
Date: Mon, 6 Dec 2010 14:31:17 +0000 (+0000)
Subject: ubuntu: Make Ubuntu into a separate distro for the package list.
X-Git-Tag: 1.7.20~23
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=227c9a4bca760f7f38e255f459720888a8335eeb

ubuntu: Make Ubuntu into a separate distro for the package list.

This allows us to select Ubuntu packages separately from Debian ones.
---

diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index c03357f..2b1a419 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -5,10 +5,16 @@
  * following symbols defined (depending on the distro):
  *
  *   REDHAT=1     For Fedora, RHEL, EPEL and workalikes.
- *   DEBIAN=1     For Debian based distros.
+ *   DEBIAN=1     For Debian.
+ *   UBUNTU=1     For Ubuntu.
  */
 
-#if REDHAT == 1
+/* Basically the same with a few minor tweaks. */
+#ifdef UBUNTU
+#define DEBIAN 1
+#endif
+
+#ifdef REDHAT
   augeas-libs
   btrfs-progs
   cryptsetup-luks
@@ -32,7 +38,9 @@
   vim-minimal
   xz
   zfs-fuse
-#elif DEBIAN == 1
+#endif /* REDHAT */
+
+#ifdef DEBIAN
   bsdmainutils
   btrfs-tools
   cryptsetup
@@ -52,7 +60,7 @@
   vim-tiny
   xz-utils
   zfs-fuse
-#endif
+#endif /* DEBIAN */
 
 bash
 binutils
diff --git a/configure.ac b/configure.ac
index 94995f1..912ea62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,6 +223,9 @@ if test "x$enable_appliance" = "xyes"; then
     DISTRO=REDHAT
     if test -f /etc/debian_version; then
         DISTRO=DEBIAN
+	if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>/dev/null; then
+            DISTRO=UBUNTU
+	fi
     fi
     AC_MSG_RESULT([$DISTRO])
     AC_SUBST([DISTRO])