X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Fpackagelist.in;h=e852f4d452640ac030ef4e2788f586546bc86ded;hb=370f79fd3d3df3511fe50f39491c2d15f653c48f;hp=51e71503ffd03aaf5ac40e172369dd68af54ed8f;hpb=8227537100d9076ac5db6ce0e9e223762b676d24;p=libguestfs.git

diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index 51e7150..e852f4d 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
@@ -18,6 +24,7 @@
   e4fsprogs
   gfs-utils
   gfs2-utils
+  grub
   hfsplus-tools
   iputils
   kernel
@@ -32,41 +39,40 @@
   vim-minimal
   xz
   zfs-fuse
-#elif DEBIAN == 1
+#endif /* REDHAT */
+
+#ifdef DEBIAN
   bsdmainutils
   btrfs-tools
   cryptsetup
+  diff
   e2fsprogs
-  /* Dependency problem prevents installation of these two:
   gfs-tools
   gfs2-tools
-  */
+  grub-pc
   hfsplus
   iproute
   libaugeas0
   linux-image
   nilfs2-tools
+  ntfs-3g
   ntfsprogs
   reiserfsprogs
   udev
   util-linux
   vim-tiny
   xz-utils
-  /* Can't be installed under debirf because the fuse-utils post script
-     requires udevd to be running.
-  ntfs-3g
   zfs-fuse
-  */
-#endif
+#endif /* DEBIAN */
 
 bash
 binutils
 coreutils
+cpio
 dosfstools
 file
 findutils
 grep
-grub
 gzip
 jfsutils
 lsof
@@ -83,5 +89,10 @@ procps
 scrub
 strace
 tar
+#ifndef UBUNTU
+/* on Ubuntu contains a file in /lib64 which conflicts with libc6 that has
+ * /lib64 as a symbolic link
+ */
 xfsprogs
+#endif
 zerofree