[gnome-boxes] Ability to disable express/unattended installation



commit a0e03d7c0d9a67035d1d38d335d4f8f956424c72
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Nov 4 17:40:55 2011 +0200

    Ability to disable express/unattended installation

 src/fedora-installer.vala     |    3 +++
 src/unattended-installer.vala |   12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/src/fedora-installer.vala b/src/fedora-installer.vala
index 3d65bc4..c2bd52d 100644
--- a/src/fedora-installer.vala
+++ b/src/fedora-installer.vala
@@ -14,6 +14,9 @@ private class Boxes.FedoraInstaller: UnattendedInstaller {
     }
 
     protected override async void prepare_direct_boot (Cancellable? cancellable) throws GLib.Error {
+        if (!express_toggle.active)
+            return;
+
         var kernel_path = os_media.get_kernel_path ();
         var initrd_path = os_media.get_initrd_path ();
 
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index b514bf7..b8acd71 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -8,7 +8,11 @@ private abstract class Boxes.UnattendedInstaller: InstallerMedia {
     public string kernel_path;
     public string initrd_path;
 
-    public string floppy_path;
+    public string _floppy_path;
+    public string floppy_path {
+        get { return express_toggle.active ? _floppy_path : null; }
+        private set { _floppy_path = value; }
+    }
 
     protected string unattended_src_path;
     protected string unattended_dest_name;
@@ -38,6 +42,12 @@ private abstract class Boxes.UnattendedInstaller: InstallerMedia {
     }
 
     public async void setup (Cancellable? cancellable) throws GLib.Error {
+        if (!express_toggle.active) {
+            debug ("Unattended installation disabled.");
+
+            return;
+        }
+
         try {
             if (yield unattended_floppy_exists (cancellable))
                 debug ("Found previously created unattended floppy image for '%s', re-using..", os.short_id);



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