Hello community,
here is the log from the commit of package yast2-firstboot for openSUSE:Factory
checked in at 2016-04-14 13:08:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old)
and /work/SRC/openSUSE:Factory/.yast2-firstboot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firstboot"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes
2016-01-05 09:41:59.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-firstboot.new/yast2-firstboot.changes
2016-04-14 13:08:28.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 13 12:48:04 UTC 2016 - jreidin...@suse.com
+
+- Do not overwrite bootloader configuration in first boot
+ (related to FATE#317701)
+- 3.1.12
+
+-------------------------------------------------------------------
Old:
----
yast2-firstboot-3.1.11.tar.bz2
New:
----
yast2-firstboot-3.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.7ybMOO/_old 2016-04-14 13:08:29.000000000 +0200
+++ /var/tmp/diff_new_pack.7ybMOO/_new 2016-04-14 13:08:29.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-firstboot
-Version: 3.1.11
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,7 +30,6 @@
# yast2/NeworkDevices -> yast2/NetworkInterfaces
Requires: yast2 >= 2.16.23
-Requires: yast2-bootloader
# Language::SwitchToEnglishIfNeeded
Requires: yast2-country >= 2.19.5
# new version of inst_license
++++++ yast2-firstboot-3.1.11.tar.bz2 -> yast2-firstboot-3.1.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-3.1.11/package/yast2-firstboot.changes
new/yast2-firstboot-3.1.12/package/yast2-firstboot.changes
--- old/yast2-firstboot-3.1.11/package/yast2-firstboot.changes 2016-01-04
15:42:10.000000000 +0100
+++ new/yast2-firstboot-3.1.12/package/yast2-firstboot.changes 2016-04-13
14:52:59.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Apr 13 12:48:04 UTC 2016 - jreidin...@suse.com
+
+- Do not overwrite bootloader configuration in first boot
+ (related to FATE#317701)
+- 3.1.12
+
+-------------------------------------------------------------------
Mon Jan 4 12:50:27 UTC 2016 - an...@suse.com
- Fixed firstboot.xml to call the correct client for LAN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-3.1.11/package/yast2-firstboot.spec
new/yast2-firstboot-3.1.12/package/yast2-firstboot.spec
--- old/yast2-firstboot-3.1.11/package/yast2-firstboot.spec 2016-01-04
15:42:10.000000000 +0100
+++ new/yast2-firstboot-3.1.12/package/yast2-firstboot.spec 2016-04-13
14:52:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-firstboot
-Version: 3.1.11
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,7 +30,6 @@
# yast2/NeworkDevices -> yast2/NetworkInterfaces
Requires: yast2 >= 2.16.23
-Requires: yast2-bootloader
# Language::SwitchToEnglishIfNeeded
Requires: yast2-country >= 2.19.5
# new version of inst_license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-3.1.11/src/Makefile.am
new/yast2-firstboot-3.1.12/src/Makefile.am
--- old/yast2-firstboot-3.1.11/src/Makefile.am 2016-01-04 15:42:10.000000000
+0100
+++ new/yast2-firstboot-3.1.12/src/Makefile.am 2016-04-13 14:52:59.000000000
+0200
@@ -17,7 +17,6 @@
clients/firstboot_config.rb \
clients/firstboot_language.rb \
clients/firstboot_licenses.rb \
- clients/firstboot_bootloader_reconfigure.rb \
clients/firstboot_language_keyboard.rb \
clients/firstboot_license_novell.rb \
clients/firstboot_network_write.rb \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-3.1.11/src/clients/firstboot_bootloader_reconfigure.rb
new/yast2-firstboot-3.1.12/src/clients/firstboot_bootloader_reconfigure.rb
--- old/yast2-firstboot-3.1.11/src/clients/firstboot_bootloader_reconfigure.rb
2016-01-04 15:42:10.000000000 +0100
+++ new/yast2-firstboot-3.1.12/src/clients/firstboot_bootloader_reconfigure.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-# encoding: utf-8
-
-#
------------------------------------------------------------------------------
-# Copyright (c) 2012 Novell, Inc. All Rights Reserved.
-#
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of version 2 of the GNU General Public License as published by the
-# Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, contact Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail, you may
find
-# current contact information at www.novell.com.
-#
------------------------------------------------------------------------------
-module Yast
- class FirstbootBootloaderReconfigureClient < Client
- def main
- Yast.import "Arch"
- Yast.import "BootCommon"
- Yast.import "Bootloader"
- Yast.import "GetInstArgs"
- Yast.import "Kernel"
- Yast.import "Mode"
-
-
- return :auto if GetInstArgs.going_back
-
- Bootloader.Reset
- if Arch.i386 || Arch.x86_64
- SetVGAKernelParam()
- Builtins.y2milestone("Setting VGA parameter to %1", Kernel.GetVgaType)
- end
-
- # pretend installation
- @mode = Mode.mode
- Mode.SetMode("installation")
-
- Bootloader.Propose
- Mode.SetMode(@mode)
-
- if Arch.i386 || Arch.x86_64
- BootCommon.selected_location = "mbr"
- BootCommon.loader_device = BootCommon.GetBootloaderDevice
- BootCommon.location_changed = true
- BootCommon.changed = true
- end
- Builtins.y2milestone("Loader type: %1", Bootloader.getLoaderType)
- Builtins.y2milestone("Summary: %1", Bootloader.Summary)
- Bootloader.Write
-
- :next
- end
-
- def SetVGAKernelParam
- cmldline = Convert.to_string(
- WFM.Read(path(".local.string"), "/proc/cmdline")
- )
-
- if cmldline == nil
- Builtins.y2error("No cmdline!")
- return
- end
-
- cmdline_args = Builtins.splitstring(cmldline, " \t\n")
-
- just_parsing = ""
-
- Builtins.foreach(cmdline_args) do |cmdline_arg|
- if Builtins.regexpmatch(cmdline_arg, "[vV][gG][aA]=.*")
- just_parsing = cmdline_arg
- cmdline_arg = Builtins.regexpsub(
- cmdline_arg,
- "[vV][gG][aA]=(.*)",
- "\\1"
- )
-
- if cmdline_arg == nil || cmdline_arg == ""
- Builtins.y2error("Incorrect vga param %1", just_parsing)
- raise Break
- else
- Builtins.y2milestone("Adjusting Kernel cmdline vga=%1",
cmdline_arg)
- Kernel.SetVgaType(cmdline_arg)
- raise Break
- end
- end
- end
-
- nil
- end
- end
-end
-
-Yast::FirstbootBootloaderReconfigureClient.new.main
