Merge remote-tracking branch 'upstream/master'

Conflicts: package/yast2-installation.changes
yast · Jul 29, 2013 · 9a0e518 · 9a0e518
2 parents 3861ecd + 675dca4
commit 9a0e518
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 26 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.24.7
+2.24.10
diff --git a/control/control.SLES-for-VMware.xml b/control/control.SLES-for-VMware.xml
@@ -1151,7 +1151,8 @@ Choose the one that matches your server the best.</label></scenarios_text>
             <modules  config:type="list">
                 <module>
 	            <label>Perform Update</label>
-                    <name>rpmcopy_secondstage</name>
+	            <name>rpmcopy_secondstage_update</name>
+	            <execute>inst_rpmcopy_secondstage</execute>
                 </module>
 		<module>
 		    <heading>yes</heading>
@@ -1585,7 +1586,8 @@ Choose the one that matches your server the best.</label></scenarios_text>
                 </module>
                 <module>
 	            <label>Perform Installation</label>
-                    <name>rpmcopy_secondstage</name>
+                    <name>rpmcopy_secondstage_autoinstall</name>
+                    <execute>inst_rpmcopy_secondstage</execute>
                 </module>
 		<module>
 		    <heading>yes</heading>
@@ -1617,7 +1619,8 @@ Choose the one that matches your server the best.</label></scenarios_text>
                 </module>
                 <module>
                     <label>Perform Update</label>
-                    <name>rpmcopy_secondstage</name>
+                    <name>rpmcopy_secondstage_autoupgrade</name>
+                    <execute>inst_rpmcopy_secondstage</execute>
                 </module>
                 <module>
                     <heading>yes</heading>

diff --git a/control/control.openSUSE.xml b/control/control.openSUSE.xml
@@ -37,11 +37,11 @@ textdomain="control"
 	<root_password_ca_check config:type="boolean">false</root_password_ca_check>
 
 	<!-- Offer online repositories feature in the installation -->
-	<show_online_repositories config:type="boolean">false</show_online_repositories>
+	<show_online_repositories config:type="boolean">true</show_online_repositories>
 	<online_repositories_default config:type="boolean">true</online_repositories_default>
 
-	<!-- Guide user to drivers.suse.com if HW was not found (FATE#312875)-->
-	<show_drivers_info config:type="boolean">false</show_drivers_info>
+        <!-- Guide user to drivers.suse.com if HW was not found (FATE#312875)-->
+        <show_drivers_info config:type="boolean">false</show_drivers_info>
 
 	<!-- Offer add-ons in the installation -->
 	<show_addons config:type="boolean">true</show_addons>
@@ -191,15 +191,24 @@ textdomain="control"
 	<online_repos_preselected config:type="boolean">false</online_repos_preselected>
 
 	<!-- FATE #300898, List of external sources accesible during the installation time -->
-	<external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_121_Servers.xml</external_sources_link>
+	<external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_131_Servers.xml</external_sources_link>
 
 	<dropped_packages></dropped_packages>
 	<extra_urls config:type="list">
 	    <!-- Default update repository, bnc #381360 -->
 	    <extra_url>
-		<baseurl>http://download.opensuse.org/update/12.2/</baseurl>
+		<baseurl>http://download.opensuse.org/update/13.1/</baseurl>
                 <alias>repo-update</alias>
-                <name>openSUSE-12.2-Update</name>
+                <name>openSUSE-13.1-Update</name>
+		<prod_dir>/</prod_dir>
+		<enabled config:type="boolean">true</enabled>
+		<autorefresh config:type="boolean">true</autorefresh>
+		<priority config:type="integer">99</priority>
+	    </extra_url>
+	    <extra_url>
+		<baseurl>http://download.opensuse.org/update/13.1-non-oss/</baseurl>
+                <alias>repo-update-non-oss</alias>
+                <name>openSUSE-13.1-Update-Non-Oss</name>
 		<prod_dir>/</prod_dir>
 		<enabled config:type="boolean">true</enabled>
 		<autorefresh config:type="boolean">true</autorefresh>
@@ -208,46 +217,56 @@ textdomain="control"
 
 	    <!-- Replacement for EXTRAURLS and OPTIONALURLS -->
 	    <extra_url>
-		<baseurl>http://download.opensuse.org/distribution/12.2/repo/oss/</baseurl>
+		<baseurl>http://download.opensuse.org/distribution/13.1/repo/oss/</baseurl>
                 <alias>repo-oss</alias>
-                <name>openSUSE-12.2-Oss</name>
+                <name>openSUSE-13.1-Oss</name>
 		<prod_dir>/</prod_dir>
 		<enabled config:type="boolean">true</enabled>
 		<autorefresh config:type="boolean">true</autorefresh>
 		<priority config:type="integer">99</priority>
 	    </extra_url>
 	    <extra_url>
-		<baseurl>http://download.opensuse.org/distribution/12.2/repo/non-oss/</baseurl>
+		<baseurl>http://download.opensuse.org/distribution/13.1/repo/non-oss/</baseurl>
                 <alias>repo-non-oss</alias>
-                <name>openSUSE-12.2-Non-Oss</name>
+                <name>openSUSE-13.1-Non-Oss</name>
 		<prod_dir>/</prod_dir>
 		<enabled config:type="boolean">true</enabled>
 		<autorefresh config:type="boolean">true</autorefresh>
 		<priority config:type="integer">99</priority>
 	    </extra_url>
 	    <extra_url>
-		<baseurl>http://download.opensuse.org/debug/distribution/12.2/repo/oss/</baseurl>
+		<baseurl>http://download.opensuse.org/debug/distribution/13.1/repo/oss/</baseurl>
                 <alias>repo-debug</alias>
-                <name>openSUSE-12.2-Debug</name>
+                <name>openSUSE-13.1-Debug</name>
 		<prod_dir>/</prod_dir>
 		<enabled config:type="boolean">false</enabled>
 		<autorefresh config:type="boolean">true</autorefresh>
 		<priority config:type="integer">99</priority>
 	    </extra_url>
             <extra_url>
-                <baseurl>http://download.opensuse.org/debug/update/12.2/</baseurl>
+                <baseurl>http://download.opensuse.org/debug/update/13.1/</baseurl>
                 <alias>repo-debug-update</alias>
-                <name>openSUSE-12.2-Update-Debug</name>
+                <name>openSUSE-13.1-Update-Debug</name>
                 <prod_dir>/</prod_dir>
                 <enabled config:type="boolean">false</enabled>
                 <autorefresh config:type="boolean">true</autorefresh>
                 <priority config:type="integer">99</priority>
             </extra_url>
+            <extra_url>
+                <baseurl>http://download.opensuse.org/debug/update/13.1-non-oss/</baseurl>
+                <alias>repo-debug-update-non-oss</alias>
+                <name>openSUSE-13.1-Update-Debug-Non-Oss</name>
+                <prod_dir>/</prod_dir>
+                <enabled config:type="boolean">false</enabled>
+                <autorefresh config:type="boolean">true</autorefresh>
+                <priority config:type="integer">99</priority>
+            </extra_url>
+
 
             <extra_url>
-                <baseurl>http://download.opensuse.org/source/distribution/12.2/repo/oss/</baseurl>
+                <baseurl>http://download.opensuse.org/source/distribution/13.1/repo/oss/</baseurl>
                 <alias>repo-source</alias>
-                <name>openSUSE-12.2-Source</name>
+                <name>openSUSE-13.1-Source</name>
                 <prod_dir>/</prod_dir>
                 <enabled config:type="boolean">false</enabled>
                 <autorefresh config:type="boolean">true</autorefresh>
@@ -272,8 +291,8 @@ textdomain="control"
 
 	    <one_supported_desktop>
 		<name>kde</name>
-		<!-- BNC #381821, BNC #438212, BNC #667408 -->
-		<desktop>kde4</desktop>
+		<!-- BNC #381821, BNC #438212, BNC #667408, BNC #763142 -->
+		<desktop>kde-plasma</desktop>
 		<label_id>desktop_kde</label_id>
 		<logon>kdm</logon>
 		<cursor>DMZ</cursor>
@@ -322,6 +341,18 @@ textdomain="control"
 		<icon>yast-x11</icon>
 	    </one_supported_desktop>
 
+	    <one_supported_desktop>
+		<name>e17</name>
+		<desktop>e17</desktop>
+		<label_id>desktop_e17</label_id>
+		<logon>lightdm</logon>
+		<cursor>DMZ</cursor>
+		<packages>lightdm branding-openSUSE</packages>
+		<order config:type="integer">7</order>
+		<patterns>e17 x11 base</patterns>
+		<icon>pattern-e17</icon>
+	    </one_supported_desktop>
+
 	    <one_supported_desktop>
 		<name>textmode</name>
 		<desktop>twm</desktop>
@@ -422,6 +453,7 @@ is the most appropriate desktop for you.</label></desktop_dialog>
 	<desktop_xfce><label>XFCE Desktop</label></desktop_xfce>
 	<desktop_lxde><label>LXDE Desktop</label></desktop_lxde>
 	<desktop_min_x><label>Minimal X Window</label></desktop_min_x>
+	<desktop_e17><label>Enlightenment Desktop</label></desktop_e17>
 	<desktop_textmode><label>Minimal Server Selection (Text Mode)</label></desktop_textmode>
 
     </texts>

diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,9 +1,28 @@
 -------------------------------------------------------------------
-Mon Jun 24 15:41:03 CEST 2013 - fehr@suse.de
+Mon Jul 29 13:43:13 CEST 2013 - fehr@suse.de
 
 - ignore SIGHUP in YaST2.Second-Stage to make autoyast installs
   with serial console succeed again (bnc#825728, bnc#823224)
 
+-------------------------------------------------------------------
+Thu Jul 11 12:23:36 CEST 2013 - aschnell@suse.de
+
+- fixed sshd check (bnc#825160)
+- 2.24.10
+
+-------------------------------------------------------------------
+Thu Jul  4 13:56:19 CEST 2013 - jsuchome@suse.cz
+
+- show release notes of newest product first (bnc#827590)
+- 2.24.9
+
+-------------------------------------------------------------------
+Tue Jun 25 10:17:46 CEST 2013 - jsuchome@suse.cz
+
+- adapt control.xml to offical Factory one:
+  added e17 desktop, enabled online repositories
+- 2.24.8
+
 -------------------------------------------------------------------
 Fri Jun 21 16:55:50 CEST 2013 - jsuchome@suse.cz
 

diff --git a/src/clients/inst_release_notes.ycp b/src/clients/inst_release_notes.ycp
@@ -99,12 +99,16 @@
     list<string> readproducts = [];
     // Release notes might be missing
     if (FileUtils::Exists(basedirectory) && FileUtils::IsDirectory(basedirectory)) {
-	readproducts = (list<string>) SCR::Read(.target.dir, basedirectory);
-
+	// sort release notes according to time (newest first),
+	// so the latest product is selected in the default tab (bnc#827590)
+	map out = (map)SCR::Execute (.target.bash_output, sformat ("ls -t1 '%1'", basedirectory));
+	readproducts = splitstring (out["stdout"]:"", "\n");
 	// bnc #407922
 	// not all objects need to be directories
 	boolean is_directory = nil;
 	readproducts = filter (string one_prod, readproducts, {
+	    if (one_prod == "") return false; // there's empty line at the end of ls output
+
 	    is_directory = FileUtils::IsDirectory (sformat ("%1/%2", basedirectory, one_prod));
 
 	    if (is_directory != true) {

diff --git a/startup/YaST2.call b/startup/YaST2.call
@@ -509,7 +509,7 @@ fi
 # 3.2) prequalification checks for SSH
 #---------------------------------------------
 # 3.2.1) Check for SSH daemon
-if ! systemctl --quiet is-active sshd ; then
+if ! /usr/sbin/rcsshd status > /dev/null 2>&1 ; then
 	log "\tNo SSH daemon running -> Medium SSH disabled"
 	MEDIUM[1]=0
 fi