Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2012-12-17 09:49:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2012-12-07 14:53:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2012-12-17 09:49:53.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 14 15:16:52 CET 2012 - [email protected] + +- disable USB sources after installation (bnc#793709) +- 2.23.5 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.23.4.tar.bz2 New: ---- yast2-installation-2.23.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.DhN5iA/_old 2012-12-17 09:49:55.000000000 +0100 +++ /var/tmp/diff_new_pack.DhN5iA/_new 2012-12-17 09:49:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 2.23.4 +Version: 2.23.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-2.23.4.tar.bz2 -> yast2-installation-2.23.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.4/VERSION new/yast2-installation-2.23.5/VERSION --- old/yast2-installation-2.23.4/VERSION 2012-12-04 16:55:44.000000000 +0100 +++ new/yast2-installation-2.23.5/VERSION 2012-12-14 15:17:04.000000000 +0100 @@ -1 +1 @@ -2.23.4 +2.23.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.4/src/clients/inst_extrasources.ycp new/yast2-installation-2.23.5/src/clients/inst_extrasources.ycp --- old/yast2-installation-2.23.4/src/clients/inst_extrasources.ycp 2012-12-04 16:53:54.000000000 +0100 +++ new/yast2-installation-2.23.5/src/clients/inst_extrasources.ycp 2012-12-14 16:55:41.000000000 +0100 @@ -51,6 +51,9 @@ // 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 @@ { 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 @@ y2milestone("Registered local sources under /mnt: %1", local_urls); + y2milestone("Registered USB sources: %1", usb_sources); + return ret; } @@ -359,6 +370,14 @@ 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 @@ } } + return `auto; /* EOF */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
