ddc77aadf5
new package (libguestfs) OBS-URL: https://build.opensuse.org/request/show/85864 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=1
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
Index: src/appliance.c
|
|
===================================================================
|
|
--- src/appliance.c.orig
|
|
+++ src/appliance.c
|
|
@@ -44,6 +44,7 @@
|
|
/* 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";
|
|
+static const char *appliance_name = "rootfs." host_cpu ".img";
|
|
|
|
static int find_path (guestfs_h *g, int (*pred) (guestfs_h *g, const char *pelem, void *data), void *data, char **pelem);
|
|
static int dir_contains_file (const char *dir, const char *file);
|
|
@@ -171,9 +172,10 @@ guestfs___build_appliance (guestfs_h *g,
|
|
size_t len = strlen (path);
|
|
*kernel = safe_malloc (g, len + strlen (kernel_name) + 2);
|
|
*initrd = safe_malloc (g, len + strlen (initrd_name) + 2);
|
|
+ *appliance = safe_malloc (g, len + strlen (appliance_name) + 2);
|
|
sprintf (*kernel, "%s/%s", path, kernel_name);
|
|
sprintf (*initrd, "%s/%s", path, initrd_name);
|
|
- *appliance = NULL;
|
|
+ sprintf (*appliance, "%s/%s", path, appliance_name);
|
|
|
|
free (path);
|
|
return 0;
|
|
@@ -187,7 +189,7 @@ guestfs___build_appliance (guestfs_h *g,
|
|
static int
|
|
contains_ordinary_appliance (guestfs_h *g, const char *path, void *data)
|
|
{
|
|
- return dir_contains_files (path, kernel_name, initrd_name, NULL);
|
|
+ return dir_contains_files (path, kernel_name, initrd_name, appliance_name, NULL);
|
|
}
|
|
|
|
static int
|