Merge pull request #14 from jsuchome/master

disable USB sources after installation (bnc#793709)

VERSION

@@ -1 +1 @@
-2.23.4
+2.23.5

package/yast2-installation.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 14 15:16:52 CET 2012 - jsuchome@suse.cz
+
+- disable USB sources after installation (bnc#793709) 
+- 2.23.5
+
 -------------------------------------------------------------------
 Tue Dec  4 16:54:56 CET 2012 - jsuchome@suse.cz
 

src/clients/inst_extrasources.ycp

@@ -51,6 +51,9 @@ import "Label";
 // local sources that have been attached under /mnt during upgrade
 map<integer,string> local_urls  = $[];
 
+// USB sources that were used during installation should be disabled (bnc#793709)
+map<integer,string> usb_sources = $[];
+
 /**
  * Returns list of maps of repositories to register. See bnc #381360.
  *
@@ -157,6 +160,12 @@ list<string> RegisteredUrls()
             {
                 local_urls[src] = url;
             }
+
+            // check for USB sources which should be disabled
+            if (issubstring (url, "device=/dev/disk/by-id/usb-"))
+            {
+                usb_sources[src]        = url;
+            }
 	}
     );
 
@@ -167,6 +176,8 @@ list<string> RegisteredUrls()
 
     y2milestone("Registered local sources under /mnt: %1", local_urls);
 
+    y2milestone("Registered USB sources: %1", usb_sources);
+
     return ret;
 }
 
@@ -359,6 +370,14 @@ if (size (local_urls) > 0) {
     Pkg::SourceSaveAll();
 }
 
+// disable USB sources
+if (size (usb_sources) > 0) {
+    foreach (integer srcid, string url, usb_sources, {
+        y2milestone ("disabling USB source %1", url);
+        Pkg::SourceSetEnabled (srcid, false);
+    });
+    Pkg::SourceSaveAll();
+}
 
 // any confirmed source to register?
 if (size (register_url) > 0) {
@@ -448,6 +467,7 @@ if (size (register_url) > 0) {
     }
 }
 
+
 return `auto;
 
 /* EOF */