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

diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index c8674b1..e852f4d 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -5,57 +5,80 @@
  * 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
   diffutils
+  e2fsprogs
   /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
   e4fsprogs
   gfs-utils
   gfs2-utils
+  grub
   hfsplus-tools
   iputils
   kernel
   MAKEDEV
   nilfs-utils
   ntfsprogs
+  ntfs-3g
   reiserfs-utils
   libselinux
   udev
   util-linux-ng
   vim-minimal
-#elif DEBIAN == 1
+  xz
+  zfs-fuse
+#endif /* REDHAT */
+
+#ifdef DEBIAN
   bsdmainutils
   btrfs-tools
-  /* Dependency problem prevents installation of these two:
+  cryptsetup
+  diff
+  e2fsprogs
   gfs-tools
   gfs2-tools
-  */
+  grub-pc
   hfsplus
   iproute
   libaugeas0
+  linux-image
   nilfs2-tools
+  ntfs-3g
+  ntfsprogs
   reiserfsprogs
   udev
   util-linux
   vim-tiny
-#endif
+  xz-utils
+  zfs-fuse
+#endif /* DEBIAN */
 
 bash
 binutils
 coreutils
+cpio
 dosfstools
 file
-grub
+findutils
+grep
+gzip
 jfsutils
 lsof
 lvm2
 module-init-tools
 net-tools
-ntfs-3g
 /*
 Enabling this pulls out 140 extra packages
 into the appliance:
@@ -65,5 +88,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