Merge pull request #14 from ancorgs/fix_clients_13_2

Merging the fix in SLE12 branch into 13.2 maintenance

MAINTAINER

@@ -1 +1 @@
-Jiri Suchomel <jsuchome@suse.cz>
+Deprecated file. Use `osc maintainer yast2-firstboot` instead.

package/yast2-firstboot.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 18 12:56:02 UTC 2014 - ancor@suse.com
+
+- Added missing module for DHCP (bnc#895359, bnc#904527).
+- Fixed errors in keyboard and language configuration (bnc#904527).
+- 3.1.5
+
 -------------------------------------------------------------------
 Wed Sep 17 19:09:03 UTC 2014 - mfilka@suse.com
 

package/yast2-firstboot.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firstboot
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/Makefile.am

@@ -21,6 +21,7 @@ client_DATA = \
   clients/firstboot_language_keyboard.rb \
   clients/firstboot_license_novell.rb \
   clients/firstboot_network_write.rb \
+  clients/firstboot_setup_dhcp.rb \
   clients/firstboot_auto.rb
 
 yncludedir = @yncludedir@/firstboot
@@ -39,4 +40,4 @@ fillup_DATA = \
 
 EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(fillup_DATA)
 
-include $(top_srcdir)/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

src/clients/firstboot_language.rb

@@ -41,7 +41,6 @@ def main
 
       Yast.import "Console"
       Yast.import "Directory"
-      Yast.import "GfxMenu"
       Yast.import "Language"
       Yast.import "Wizard"
       Yast.import "Firstboot"
@@ -132,7 +131,6 @@ def main
 
           # update bootloader menu
           Language.WfmSetLanguage
-          GfxMenu.Update
         else
           Builtins.y2milestone("Language not changed --> doing nothing")
         end

src/clients/firstboot_language_keyboard.rb

@@ -44,7 +44,6 @@ def main
       Yast.import "Console"
       Yast.import "Directory"
       Yast.import "GetInstArgs"
-      Yast.import "GfxMenu"
       Yast.import "Keyboard"
       Yast.import "Label"
       Yast.import "Language"
@@ -280,8 +279,6 @@ def SetLanguageIfChanged(ret)
         Keyboard.Save
         Timezone.Save
         Console.Save
-        # update bootloader menu items
-        GfxMenu.Update
       end
 
       false