diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2010-12-04 21:14:17 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-12-05 11:23:23 +0000 |
| commit | 6d75ce8e6ca1f3f0a946ee4e214f6d2bff07adc4 (patch) | |
| tree | eabf83eb465fa7f7ff7347ee26547a18675b476d /src | |
| parent | 078fbee4e73036783aefef9401735f8b80e81bb2 (diff) | |
| download | libguestfs-6d75ce8e6ca1f3f0a946ee4e214f6d2bff07adc4.tar.gz libguestfs-6d75ce8e6ca1f3f0a946ee4e214f6d2bff07adc4.tar.xz libguestfs-6d75ce8e6ca1f3f0a946ee4e214f6d2bff07adc4.zip | |
appliance: Change to using febootstrap 3.x supermin appliance.
This removes all support for building the ordinary / old
style appliance using febootstrap 2.x, debootstrap, debirf,
fakeroot and fakechroot.
Instead this uses febootstrap 3.x to build the supermin appliance
in a simpler cross-distro manner.
Diffstat (limited to 'src')
| -rw-r--r-- | src/appliance.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/appliance.c b/src/appliance.c index aa716d6d..b6854b00 100644 --- a/src/appliance.c +++ b/src/appliance.c @@ -41,6 +41,7 @@ #include "guestfs-internal-actions.h" #include "guestfs_protocol.h" +/* Old-style appliance is going to be obsoleted. */ static const char *kernel_name = "vmlinuz." host_cpu; static const char *initrd_name = "initramfs." host_cpu ".img"; @@ -48,13 +49,11 @@ static int find_path (guestfs_h *g, int (*pred) (guestfs_h *g, const char *pelem static int dir_contains_file (const char *dir, const char *file); static int dir_contains_files (const char *dir, ...); static int contains_ordinary_appliance (guestfs_h *g, const char *path, void *data); -#if ENABLE_SUPERMIN static int contains_supermin_appliance (guestfs_h *g, const char *path, void *data); static char *calculate_supermin_checksum (guestfs_h *g, const char *supermin_path); static int check_for_cached_appliance (guestfs_h *g, const char *supermin_path, const char *checksum, char **kernel, char **initrd, char **appliance); static int build_supermin_appliance (guestfs_h *g, const char *supermin_path, const char *checksum, char **kernel, char **initrd, char **appliance); static int run_supermin_helper (guestfs_h *g, const char *supermin_path, const char *cachedir, size_t cdlen); -#endif /* Locate or build the appliance. * @@ -90,7 +89,6 @@ guestfs___build_appliance (guestfs_h *g, { int r; -#if ENABLE_SUPERMIN /* Step (1). */ char *supermin_path; r = find_path (g, contains_supermin_appliance, NULL, &supermin_path); @@ -119,7 +117,6 @@ guestfs___build_appliance (guestfs_h *g, } free (supermin_path); } -#endif /* Step (5). */ char *path; @@ -150,7 +147,6 @@ contains_ordinary_appliance (guestfs_h *g, const char *path, void *data) return dir_contains_files (path, kernel_name, initrd_name, NULL); } -#if ENABLE_SUPERMIN static int contains_supermin_appliance (guestfs_h *g, const char *path, void *data) { @@ -536,7 +532,6 @@ run_supermin_helper (guestfs_h *g, const char *supermin_path, perror ("execvp"); _exit (EXIT_FAILURE); } -#endif /* Search elements of g->path, returning the first path element which * matches the predicate function 'pred'. |