[gnome-boxes] express,fedora: Don't use remote repos for F16

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 169a4f51f4480c052a3f6e14378d9074162eaac4
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Aug 10 02:08:11 2012 +0300

    express,fedora: Don't use remote repos for F16
    
    Now that F17 has been out for a while and F18 isn't that far off, F16
    isn't important enough anymore to justify (very slow) installation from
    network and the synchronous network availability check. Better just not
    install buggy vdagent/QXL.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=680825

 data/fedora.ks            |    6 +-----
 src/fedora-installer.vala |   29 ++++++-----------------------
 2 files changed, 7 insertions(+), 28 deletions(-)
---
diff --git a/data/fedora.ks b/data/fedora.ks
index a2f7ccd..33f6366 100644
--- a/data/fedora.ks
+++ b/data/fedora.ks
@@ -23,8 +23,6 @@ reboot
 
 user --name=BOXES_USERNAME --password=BOXES_PASSWORD
 
-BOXES_FEDORA_REPOS
-
 %packages
 @base
 @core
@@ -34,9 +32,7 @@ BOXES_FEDORA_REPOS
 @graphical-internet
 @sound-and-video
 
-# QXL video driver and SPICE vdagent
-xorg-x11-drv-qxl
-spice-vdagent
+BOXES_FEDORA_SPICE_PACKAGES
 
 %end
 
diff --git a/src/fedora-installer.vala b/src/fedora-installer.vala
index 1982b47..b169a3f 100644
--- a/src/fedora-installer.vala
+++ b/src/fedora-installer.vala
@@ -12,16 +12,15 @@ private class Boxes.FedoraInstaller: UnattendedInstaller {
 
     private string kbd;
 
-    // F16 ships buggly QXL package and spice-vdagent package won't be shipped until F17 so we install from
-    // up2date remote repos for anything less than F17.
-    private bool use_remote_repos { get { return express_install && uint64.parse (os.version) < 17; } }
+    // F16 ships buggly QXL package and spice-vdagent package so simply not install those on F16 and older
+    private bool install_spice_goodies { get { return uint64.parse (os.version) >= 17; } }
 
-    private static Regex repo_regex;
+    private static Regex spice_packages_regex;
     private static Regex kbd_regex;
 
     static construct {
         try {
-            repo_regex = new Regex ("BOXES_FEDORA_REPOS");
+            spice_packages_regex = new Regex ("BOXES_FEDORA_SPICE_PACKAGES");
             kbd_regex = new Regex ("BOXES_FEDORA_KBD");
         } catch (RegexError error) {
             // This just can't fail
@@ -47,22 +46,6 @@ private class Boxes.FedoraInstaller: UnattendedInstaller {
         os.set_cmdline ("ks=hd:sda:/ks.cfg");
     }
 
-    public override void check_needed_info () throws UnattendedInstallerError.SETUP_INCOMPLETE {
-        base.check_needed_info ();
-
-        if (!use_remote_repos)
-            return;
-
-        try {
-            var client = new SocketClient ();
-            client.connect_to_host ("fedoraproject.org", 80);
-        } catch (GLib.Error error) {
-            var message = _("Internet access required for express installation of Fedora 16 and older");
-
-            throw new UnattendedInstallerError.SETUP_INCOMPLETE (message);
-        }
-    }
-
     protected override async void prepare_direct_boot (Cancellable? cancellable) throws GLib.Error {
         if (!express_toggle.active)
             return;
@@ -96,9 +79,9 @@ private class Boxes.FedoraInstaller: UnattendedInstaller {
 
         str = kbd_regex.replace (str, str.length, 0, kbd);
 
-        var repos = (use_remote_repos) ? "repo --name=fedora\nrepo --name=updates" : "";
+        var spice_packages = (install_spice_goodies) ? "xorg-x11-drv-qxl\nspice-vdagent" : "";
 
-        return repo_regex.replace (str, str.length, 0, repos);
+        return spice_packages_regex.replace (str, str.length, 0, spice_packages);
     }
 
     private async void normal_clean_up (Cancellable? cancellable) throws GLib.Error {