X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Fpackagelist.in;h=1faef2bb913515ee2205ded4c9bf3aca7f97c7d2;hb=095433f7b0b0a387268eb1a79c897d97092a9500;hp=6927be895d0c679f8585210834557ac525c21543;hpb=75f0a92debd3f68c544c821fa54a973b91ea7e42;p=libguestfs.git

diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index 6927be8..1faef2b 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,37 +38,39 @@
   vim-minimal
   xz
   zfs-fuse
-#elif DEBIAN == 1
+#endif /* REDHAT */
+
+#ifdef DEBIAN
   bsdmainutils
   btrfs-tools
   cryptsetup
-  /* Dependency problem prevents installation of these two:
+  e2fsprogs
   gfs-tools
   gfs2-tools
-  */
   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
 dosfstools
 file
+findutils
+grep
 grub
+gzip
 jfsutils
 lsof
 lvm2
@@ -77,5 +85,11 @@ parted
 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