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

diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index 51e7150..f8f2642 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -5,19 +5,31 @@
  * 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.
+ *   ARCHLINUX=1  For Archlinux.
+ *
+ * There is also a list of packages which are excluded if they appear
+ * as dependencies of the packages below.  See: excludelist.in
  */
 
-#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
+  cryptsetup
+  cryptsetup-luks /* old name used before Fedora 17 */
   diffutils
   e2fsprogs
   /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
   e4fsprogs
   gfs-utils
   gfs2-utils
+  grub
   hfsplus-tools
   iputils
   kernel
@@ -27,50 +39,75 @@
   ntfs-3g
   reiserfs-utils
   libselinux
+  systemd /* for /sbin/reboot */
   udev
   util-linux-ng
   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
+  nilfs-tools
+  ntfs-3g
   ntfsprogs
   reiserfsprogs
   udev
+  ufsutils
   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 */
 
+#ifdef ARCHLINUX
+  linux
+  vim
+  btrfs-progs-unstable
+  cryptsetup
+  diffutils
+  augeas
+  zfs-fuse
+  e2fsprogs
+  grub
+  iputils
+  nilfs-utils
+  ntfsprogs
+  ntfs-3g
+  reiserfsprogs
+  udev
+  util-linux-ng
+  xz
+#endif /* ARCHLINUX */
+
+acl
+attr
 bash
 binutils
 coreutils
+cpio
 dosfstools
 file
 findutils
+gawk
 grep
-grub
 gzip
 jfsutils
 lsof
 lvm2
+lzop
 module-init-tools
 net-tools
 /*
@@ -83,5 +120,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