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

diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index f335531..1faef2b 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -5,24 +5,91 @@
  * following symbols defined (depending on the distro):
  *
  *   REDHAT=1     For Fedora, RHEL, EPEL and workalikes.
+ *   DEBIAN=1     For Debian.
+ *   UBUNTU=1     For Ubuntu.
  */
 
-augeas-libs
+/* 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
+  hfsplus-tools
+  iputils
+  kernel
+  MAKEDEV
+  nilfs-utils
+  ntfsprogs
+  ntfs-3g
+  reiserfs-utils
+  libselinux
+  udev
+  util-linux-ng
+  vim-minimal
+  xz
+  zfs-fuse
+#endif /* REDHAT */
+
+#ifdef DEBIAN
+  bsdmainutils
+  btrfs-tools
+  cryptsetup
+  e2fsprogs
+  gfs-tools
+  gfs2-tools
+  hfsplus
+  iproute
+  libaugeas0
+  linux-image
+  nilfs2-tools
+  ntfs-3g
+  ntfsprogs
+  reiserfsprogs
+  udev
+  util-linux
+  vim-tiny
+  xz-utils
+  zfs-fuse
+#endif /* DEBIAN */
+
 bash
 binutils
 coreutils
 dosfstools
 file
+findutils
+grep
 grub
-iputils
-kernel
+gzip
+jfsutils
+lsof
 lvm2
-MAKEDEV
 module-init-tools
 net-tools
-ntfs-3g
-ntfsprogs
+/*
+Enabling this pulls out 140 extra packages
+into the appliance:
+ocfs2-tools
+*/
+parted
 procps
+scrub
 strace
-util-linux-ng
+tar
+#ifndef UBUNTU
+/* on Ubuntu contains a file in /lib64 which conflicts with libc6 that has
+ * /lib64 as a symbolic link
+ */
+xfsprogs
+#endif
 zerofree