[gnome-boxes] Always create new unattended file



commit fccd8ccfc89b08a91599782c47ce1a8947898545
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Dec 1 15:53:52 2011 +0200

    Always create new unattended file
    
    We weren't actually updating the express install settings after the
    first install of an OS (lame!). Perhaps we really should be caching the
    unattened file but I don't think performance will improve much (if at all)
    so its good like this for now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=665290

 src/unattended-installer.vala |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index acce378..fe181f3 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -73,11 +73,10 @@ private abstract class Boxes.UnattendedInstaller: InstallerMedia {
         try {
             if (yield unattended_floppy_exists (cancellable))
                 debug ("Found previously created unattended floppy image for '%s', re-using..", os.short_id);
-            else {
+            else
                 yield create_floppy_image (cancellable);
-                yield copy_unattended_file (cancellable);
-            }
 
+            yield copy_unattended_file (cancellable);
             yield prepare_direct_boot (cancellable);
         } catch (GLib.Error error) {
             clean_up ();
@@ -233,7 +232,7 @@ private abstract class Boxes.UnattendedInstaller: InstallerMedia {
 
         debug ("Copying unattended file '%s' into floppy drive/image '%s'", unattended_dest_name, floppy_path);
         // FIXME: Perhaps we should use libarchive for this?
-        string[] argv = { "mcopy", "-i", floppy_path,
+        string[] argv = { "mcopy", "-n", "-o", "-i", floppy_path,
                                    unattended_tmp_path,
                                    "::" + unattended_dest_name };
         yield exec (argv, cancellable);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]