>From 5a2a450b0b54e3d004f558c353594a3452cf0403 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 Nov 2012 18:33:33 +0000 Subject: [PATCH 1/2] DEBIAN 7: REVERT 3ed3e23ed (NO FEBOOTSTRAP COPY-KERNEL OPTION). --- src/appliance.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/appliance.c b/src/appliance.c index 8a22064..aa2a5b5 100644 --- a/src/appliance.c +++ b/src/appliance.c @@ -102,7 +102,7 @@ gl_lock_define_initialized (static, building_lock); * $TMPDIR/.guestfs-$UID/ and consists of four files: * * $TMPDIR/.guestfs-$UID/checksum - the checksum - * $TMPDIR/.guestfs-$UID/kernel - the kernel + * $TMPDIR/.guestfs-$UID/kernel - symlink to the kernel * $TMPDIR/.guestfs-$UID/initrd - the febootstrap initrd * $TMPDIR/.guestfs-$UID/root - the appliance * @@ -645,7 +645,7 @@ hard_link_to_cached_appliance (guestfs_h *g, perrorf (g, "link: %s %s", filename, *kernel); goto error; } - (void) utimes (filename, NULL); + (void) lutimes (filename, NULL); /* lutimes because it's a symlink */ snprintf (filename, len, "%s/initrd", cachedir); (void) unlink (*initrd); @@ -697,7 +697,6 @@ run_supermin_helper (guestfs_h *g, const char *supermin_path, guestfs___cmd_add_arg (cmd, "-g"); guestfs___cmd_add_arg_format (cmd, "%d", egid); } - guestfs___cmd_add_arg (cmd, "--copy-kernel"); guestfs___cmd_add_arg (cmd, "-f"); guestfs___cmd_add_arg (cmd, "ext2"); guestfs___cmd_add_arg_format (cmd, "%s/supermin.d", supermin_path); -- 1.7.10.4