Merge pull request #27 from ancorgs/fix_profile_sp1

Merge of the fix for bsc#960081 into SP1 branch
yast · Jan 4, 2016 · 3ad281c · 3ad281c
2 parents fb699f6 + 761419f
commit 3ad281c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,5 @@
 require "yast/rake"
 
-Yast::Tasks.submit_to :sle12sp1
-
 Yast::Tasks.configuration do |conf|
   #lets ignore license check for now
   conf.skip_license_check << /.*/

diff --git a/control/firstboot.xml b/control/firstboot.xml
@@ -70,15 +70,6 @@
                 <proposal_module>printer</proposal_module>
             </proposal_modules>
         </proposal>
-        <proposal>
-            <name>firstboot_network</name>
-            <mode>installation</mode>
-            <stage>firstboot</stage>
-            <label>Network Configuration</label>
-            <proposal_modules config:type="list">
-                <proposal_module>lan</proposal_module>
-            </proposal_modules>
-        </proposal>
     </proposals>
     <workflows  config:type="list">
         <workflow>
@@ -147,9 +138,8 @@
                 </module>
                 <module>
                     <label>Network</label>
-                    <name>inst_proposal</name>
+                    <name>inst_lan</name>
                     <enabled config:type="boolean">false</enabled>
-                    <proposal>firstboot_network</proposal>
                 </module>
                  <module>
                     <label>Automatic Configuration</label>
@@ -173,9 +163,8 @@
                 </module>
                 <module>
                     <label>Network</label>
-                    <name>inst_proposal</name>
+                    <name>inst_lan</name>
                     <enabled config:type="boolean">false</enabled>
-                    <proposal>firstboot_network</proposal>
                 </module>
                 <module>
                     <label>Root Password</label>

diff --git a/package/yast2-firstboot.changes b/package/yast2-firstboot.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan  4 12:50:27 UTC 2016 - ancor@suse.com
+
+- Fixed firstboot.xml to call the correct client for LAN
+  configuration (bsc#960081)
+- 3.1.11
+
 -------------------------------------------------------------------
 Fri Oct 16 12:21:01 UTC 2015 - ancor@suse.com
 

diff --git a/package/yast2-firstboot.spec b/package/yast2-firstboot.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firstboot
-Version:        3.1.10
+Version:        3.1.11
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build