Merge pull request #8 from mchf/master

Added client for network autoconfiguration
yast · Sep 18, 2014 · 61045fd · 61045fd
2 parents e17b8bf + 32028c2
commit 61045fd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/control/firstboot.xml b/control/firstboot.xml
@@ -93,7 +93,7 @@
             <modules  config:type="list">
                 <module>
                     <label>Network Autosetup</label>
-                    <name>setup_dhcp</name>
+                    <name>firstboot_setup_dhcp</name>
                 </module>
                 <module>
                     <label>Language and Keyboard</label>

diff --git a/package/yast2-firstboot.changes b/package/yast2-firstboot.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 17 19:09:03 UTC 2014 - mfilka@suse.com
+
+- bnc#895359
+  - added client for nic cards autoconfiguration 
+- 3.1.4
+
 -------------------------------------------------------------------
 Wed Jul  9 13:59:18 CEST 2014 - schubi@suse.de
 

diff --git a/package/yast2-firstboot.spec b/package/yast2-firstboot.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firstboot
-Version:        3.1.3
+Version:        3.1.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -35,6 +35,8 @@ Requires:	yast2-bootloader
 Requires:	yast2-country >= 2.19.5
 # new version of inst_license
 Requires:	yast2-installation >= 2.19.0
+# network autoconfiguration
+Requires:	yast2-network >= 3.1.91
 
 BuildArchitectures:	noarch
 

diff --git a/src/clients/firstboot_setup_dhcp.rb b/src/clients/firstboot_setup_dhcp.rb
@@ -0,0 +1,6 @@
+require "yast"
+require "network/network_autoconfiguration"
+
+Yast::NetworkAutoconfiguration.instance.configure_dhcp
+
+:next