April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-04-26 11:45:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-04-13 13:13:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-04-26 11:45:11.000000000 +0200 @@ -1,0 +2,54 @@ +Tue Apr 22 08:44:57 UTC 2014 - jreidinger(a)suse.com + +- Use correct check for partition setup for grub2 on s390 + (bnc#873951) +- 3.1.29 + +------------------------------------------------------------------- +Thu Apr 17 14:46:17 UTC 2014 - jreidinger(a)suse.com + +- do not complain for missing bios order on s390(bnc#874106) +- 3.1.28 + +------------------------------------------------------------------- +Thu Apr 17 11:18:31 UTC 2014 - jreidinger(a)suse.com + +- improve logging if setting kernel paramater failed to help with + bnc#873996 +- remove graphic adapter configuration on s390 (bnc#874010) +- 3.1.27 + +------------------------------------------------------------------- +Wed Apr 16 19:49:56 UTC 2014 - jreidinger(a)suse.com + +- allow switching to grub2 also on ppc +- Do not raise exception for grub2efi on non-pc architectures + (bnc#873861) +- 3.1.26 + +------------------------------------------------------------------- +Wed Apr 16 12:11:53 UTC 2014 - jreidinger(a)suse.com + +- fix crash on s390 due to missing loader widget(bnc#873911) +- 3.1.25 + +------------------------------------------------------------------- +Tue Apr 15 10:52:27 UTC 2014 - jreidinger(a)suse.com + +- fix proposing when proposal do not change (bnc#873620) +- 3.1.24 + +------------------------------------------------------------------- +Tue Apr 15 10:38:17 UTC 2014 - jreidinger(a)suse.com + +- cleaning up deprecated code to improve stability and maintenance + of code +- 3.1.23 + +------------------------------------------------------------------- +Tue Apr 15 08:33:29 UTC 2014 - mchang(a)suse.com + +- remove error if boot directory on xfs file system (bnc#864370) +- 3.1.22 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.21.tar.bz2 New: ---- yast2-bootloader-3.1.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.qJXJZj/_old 2014-04-26 11:45:12.000000000 +0200 +++ /var/tmp/diff_new_pack.qJXJZj/_new 2014-04-26 11:45:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.21 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.21.tar.bz2 -> yast2-bootloader-3.1.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/package/yast2-bootloader.changes new/yast2-bootloader-3.1.29/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.21/package/yast2-bootloader.changes 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/package/yast2-bootloader.changes 2014-04-22 11:18:41.000000000 +0200 @@ -1,4 +1,58 @@ ------------------------------------------------------------------- +Tue Apr 22 08:44:57 UTC 2014 - jreidinger(a)suse.com + +- Use correct check for partition setup for grub2 on s390 + (bnc#873951) +- 3.1.29 + +------------------------------------------------------------------- +Thu Apr 17 14:46:17 UTC 2014 - jreidinger(a)suse.com + +- do not complain for missing bios order on s390(bnc#874106) +- 3.1.28 + +------------------------------------------------------------------- +Thu Apr 17 11:18:31 UTC 2014 - jreidinger(a)suse.com + +- improve logging if setting kernel paramater failed to help with + bnc#873996 +- remove graphic adapter configuration on s390 (bnc#874010) +- 3.1.27 + +------------------------------------------------------------------- +Wed Apr 16 19:49:56 UTC 2014 - jreidinger(a)suse.com + +- allow switching to grub2 also on ppc +- Do not raise exception for grub2efi on non-pc architectures + (bnc#873861) +- 3.1.26 + +------------------------------------------------------------------- +Wed Apr 16 12:11:53 UTC 2014 - jreidinger(a)suse.com + +- fix crash on s390 due to missing loader widget(bnc#873911) +- 3.1.25 + +------------------------------------------------------------------- +Tue Apr 15 10:52:27 UTC 2014 - jreidinger(a)suse.com + +- fix proposing when proposal do not change (bnc#873620) +- 3.1.24 + +------------------------------------------------------------------- +Tue Apr 15 10:38:17 UTC 2014 - jreidinger(a)suse.com + +- cleaning up deprecated code to improve stability and maintenance + of code +- 3.1.23 + +------------------------------------------------------------------- +Tue Apr 15 08:33:29 UTC 2014 - mchang(a)suse.com + +- remove error if boot directory on xfs file system (bnc#864370) +- 3.1.22 + +------------------------------------------------------------------- Thu Apr 10 11:18:51 UTC 2014 - jreidinger(a)suse.com - drop not-supported bootloaders except grub1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/package/yast2-bootloader.spec new/yast2-bootloader-3.1.29/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.21/package/yast2-bootloader.spec 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/package/yast2-bootloader.spec 2014-04-22 11:18:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.21 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/clients/bootloader_proposal.rb new/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb --- old/yast2-bootloader-3.1.21/src/clients/bootloader_proposal.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb 2014-04-22 11:18:41.000000000 +0200 @@ -47,16 +47,27 @@ Bootloader.Reset end - if Bootloader.getLoaderType == "grub2" - if !Mode.update - if !Bootloader.proposed_cfg_changed && !Mode.autoinst - Bootloader.blRead(true, true) - BootCommon.was_read = true - end + # proposal not changed by user so repropose it from scratch + if !Bootloader.proposed_cfg_changed && !Mode.autoinst + Builtins.y2milestone "Proposal not modified, so repropose from scratch" + Bootloader.ResetEx(false) + end + if Mode.update + if ["grub2", "grub2-efi"].include? Bootloader.getLoaderType + Builtins.y2milestone "update of grub2, do not repropose" + Bootloader.blRead(true, true) + else + BootCommon.setLoaderType(nil) + Bootloader.Reset Bootloader.Propose end + else + # in installation always propose missing stuff + Bootloader.Propose + end + if Bootloader.getLoaderType == "grub2" @ret["links"] = [ "enable_boot_mbr", "disable_boot_mbr", @@ -65,25 +76,8 @@ "enable_boot_boot", "disable_boot_boot" ] - elsif Bootloader.getLoaderType == "grub2-efi" - if !Mode.update - if !Bootloader.proposed_cfg_changed && !Mode.autoinst - Bootloader.blRead(true, true) - BootCommon.was_read = true - end - - Bootloader.Propose - end - else - # repropose if grub2 is not used during upgrade - if Mode.update - Builtins.y2milestone("Cfg not changed before, recreating") - Bootloader.ResetEx(false) - BootCommon.setLoaderType(nil) - end - - Bootloader.Propose end + # to make sure packages will get installed BootCommon.setLoaderType(BootCommon.getLoaderType(false)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -662,11 +662,6 @@ Builtins.y2milestone("/boot is in logical partition: %1", is_logical) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = BootCommon.KeepMBR(BootCommon.mbrDisk) - # if is primary, store bootloader there exit = 0 @@ -699,7 +694,7 @@ Ops.set( BootCommon.globals, "generic_mbr", - out != "vista" && !keep_mbr ? "true" : "false" + out != "vista" ? "true" : "false" ) if out == "vista" Builtins.y2milestone("Vista MBR...") @@ -719,15 +714,6 @@ selected_location = :mbr end - if keep_mbr - if is_logical && extended != nil - selected_location = :extended - else - selected_location = BootStorage.BootPartitionDevice != - BootStorage.RootPartitionDevice ? :boot : :root - end - end - SetBootloaderDevice(selected_location) if !Builtins.contains( BootStorage.getPartitionList(:boot, "grub"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub/options.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/options.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub/options.rb 2014-04-22 11:18:41.000000000 +0200 @@ -370,6 +370,7 @@ ) ), "init" => fun_ref(method(:InitConsole), "void (string)"), + "handle" => fun_ref(method(:HandleConsole), "void (string, map)"), "store" => fun_ref(method(:StoreConsole), "void (string, map)"), "help" => Ops.get(@grub_help_messages, "serial", "") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/dialogs.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/dialogs.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/dialogs.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/dialogs.rb 2014-04-22 11:18:41.000000000 +0200 @@ -68,6 +68,7 @@ def kernel_tab widgets = ["vgamode", "append", "append_failsafe", "console"] widgets.delete("console") if Arch.s390 # there is no console on s390 (bnc#868909) + widgets.delete("vgamode") if Arch.s390 # there is no graphic adapter on s390 (bnc#874010) { "id" => "kernel_tab", @@ -282,6 +283,8 @@ @_grub2_widgets = { "loader_location" => grubBootLoaderLocationWidget } when /ppc/ @_grub2_widgets = { "loader_location" => grub_on_ppc_location } + when /s390/ + @_grub2_widgets = {} #no loader location for s390 as it is automatic else raise "unsuppoted architecture #{Arch.architecture}" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -668,11 +668,6 @@ ) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = BootCommon.KeepMBR(BootCommon.mbrDisk) - # if is primary, store bootloader there exit = 0 @@ -705,7 +700,7 @@ Ops.set( BootCommon.globals, "generic_mbr", - out != "vista" && !keep_mbr ? "true" : "false" + out != "vista" ? "true" : "false" ) if out == "vista" Builtins.y2milestone("Vista MBR...") @@ -725,19 +720,7 @@ selected_location = :mbr end - if keep_mbr - if is_logical && extended != nil - selected_location = :extended - else - selected_location = BootStorage.BootPartitionDevice != - BootStorage.RootPartitionDevice ? :boot : :root - end - end - if is_logical_and_btrfs - if keep_mbr - Builtins.y2milestone("force to use mbr even if keep_mbr is suggested") - end Builtins.y2milestone( "/boot is on logical parititon and uses btrfs, mbr is favored in this situration" ) @@ -1074,7 +1057,7 @@ BootStorage.ProposeDeviceMap md_mbr = BootStorage.addMDSettingsToGlobals Ops.set(BootCommon.globals, "boot_md_mbr", md_mbr) if md_mbr != "" - BootCommon.InitializeLibrary(true, "grub") + BootCommon.InitializeLibrary(true, "grub2") end if !Mode.autoinst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/i386.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/i386.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/i386.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/i386.rb 2014-04-22 11:18:41.000000000 +0200 @@ -105,21 +105,6 @@ @_thinkpad_mbr end - # Keep the MBR contents on the specified disk? Check whether the contents - # should be kept because ot contains vendor-specific data - # @param [String] disk string the disk to be checked - # @return [Boolean] true to keep the contents - def KeepMBR(disk) - # FIXME: see bug #464485 there is problem with detection of - # MBR the 3rd byte is 0 after recovery thinkpad notebook with - # recovery CD, next missing cooperate with Lenovo there also - # missing any specification about Lenovo's changes in MBR - - Builtins.y2milestone("Skip checking of MBR for thinkpad sequence") - - false - end - # Add the partition holding firmware to bootloader? # @param [String] disk string the disk to be checked # @return [Boolean] true if firmware partition is to be added @@ -127,61 +112,6 @@ !ThinkPadMBR(disk) end - # Display bootloader summary - # @return a list of summary lines - def i386Summary - ret = Summary() - order_sum = DiskOrderSummary() - ret = Builtins.add(ret, order_sum) if order_sum != nil - deep_copy(ret) - end - - # Propose the boot loader location for i386 (and similar) platform - def i386LocationProposal - if !@was_proposed - DetectDisks() - @del_parts = BootStorage.getPartitionList( - :deleted, - getLoaderType(false) - ) - # check whether edd is loaded; if not: load it - lsmod_command = "lsmod | grep edd" - Builtins.y2milestone("Running command %1", lsmod_command) - lsmod_out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), lsmod_command) - ) - Builtins.y2milestone("Command output: %1", lsmod_out) - edd_loaded = Ops.get_integer(lsmod_out, "exit", 0) == 0 - if !edd_loaded - command = "/sbin/modprobe edd" - Builtins.y2milestone("Loading EDD module, running %1", command) - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), command) - ) - Builtins.y2milestone("Command output: %1", out) - end - end - - # refresh device map - if (BootStorage.device_mapping == nil || - Builtins.size(BootStorage.device_mapping) == 0) && - getLoaderType(false) == "grub" - BootStorage.ProposeDeviceMap - end - - if DisksChanged() && !Mode.autoinst - if askLocationResetPopup(@loader_device) - @selected_location = nil - @loader_device = nil - Builtins.y2milestone("Reconfiguring locations") - DetectDisks() - end - end - - nil - end - - # Do updates of MBR after the bootloader is installed # @return [Boolean] true on success def PostUpdateMBR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lib_iface.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lib_iface.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lib_iface.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lib_iface.rb 2014-04-22 11:18:41.000000000 +0200 @@ -272,24 +272,6 @@ res_data.unlink end - # Display the log file written by the underlying bootloader libraries - def bootloaderError(error) - bl_logfile = "/var/log/YaST2/y2log_bootloader" - bl_log = Convert.to_string(SCR.Read(path(".target.string"), bl_logfile)) - - errorWithLogPopup( - Builtins.sformat( - # error popup - label, %1 is bootloader name - _("Error occurred while installing %1."), - getLoaderName(getLoaderType(false), :summary) - ), - bl_log - ) - Builtins.y2error("%1", error) - - nil - end - # Read the files from the system to internal cache of the library # @param [Boolean] avoid_reading_device_map do not read the device map, but use internal # data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lilolike.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lilolike.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lilolike.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lilolike.rb 2014-04-22 11:18:41.000000000 +0200 @@ -48,33 +48,6 @@ ] end - # Check whether disk settings were changed since last checking - # @return [Boolean] true if needs to recheck - def DisksChanged - return false if Mode.config - mp = Storage.GetMountPoints - actual_root = Ops.get_string(mp, ["/", 0], "") - actual_boot = Ops.get_string(mp, ["/boot", 0], actual_root) - - # don't change configuration if '/' and '/boot' were not changed - # and location is "floppy", "mbr" or "boot" - if actual_boot == BootStorage.BootPartitionDevice && - actual_root == BootStorage.RootPartitionDevice && - @selected_location != "custom" && - @selected_location != "" && - @selected_location != nil - return false - end - - all_partitions = BootStorage.getPartitionList(:boot, getLoaderType(false)) - - if !Builtins.contains(all_partitions, @loader_device) - Builtins.y2milestone("Location should be set again") - return true - end - false - end - # FindMbrDisk() # try to find the system's mbr device # @return [String] mbr device @@ -186,11 +159,6 @@ Builtins.y2milestone("/boot is in logical partition: %1", is_logical) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = KeepMBR(@loader_device) - exit = 0 # if is primary, store bootloader there if disk_is_mbr && !is_logical @@ -198,29 +166,11 @@ @loader_device = BootStorage.BootPartitionDevice @activate = true @activate_changed = true - - # check if there is raid and if it soft-raid select correct device for analyse MBR - # bnc #398356 - if Ops.greater_than(Builtins.size(needed_devices), 1) - disk = soft_MDraid_boot_disk(partitions) - end - disk = Ops.get_string(dp, "disk", "") if disk == "" - out = examineMBR(disk) - - @repl_mbr = out != "vista" && !keep_mbr elsif Ops.greater_than(Builtins.size(needed_devices), 1) @loader_device = "mbr_md" @selected_location = "mbr_md" end - if keep_mbr - if is_logical && extended != nil - @loader_device = extended - else - @loader_device = BootStorage.BootPartitionDevice - end - @selected_location = "boot" - end if !Builtins.contains( BootStorage.getPartitionList(:boot, getLoaderType(false)), @loader_device @@ -494,7 +444,6 @@ parts = BootStorage.getPartitionList(:parts_old, getLoaderType(false)) if @partitioning_last_change != Storage.GetTargetChangeTime && @files_edited displayFilesEditedPopup - @files_edited_warned = true return end @@ -670,19 +619,6 @@ nil end - - # Update sections of bootloader menu (removes obsolete thinks and - # place for ugly hacks (but doesn't efect zypper dup)) - # modifies internal structures - # label update is done in perl-Bootloader during updating kernel - # Purpose is don't break anything, but expect that previous state is - # working - def UpdateSections - Builtins.foreach(@sections) do |section| - end - - nil - end # Update global options of bootloader # modifies internal sreuctures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -650,222 +650,6 @@ Builtins.toset(ret) end - # Get last change time of file - # @param [String] filename string name of file - # @return [String] last change date as YYYY-MM-DD-HH-MM-SS - def getFileChangeDate(filename) - stat = Convert.to_map(SCR.Read(path(".target.stat"), filename)) - ctime = Ops.get_integer(stat, "ctime", 0) - command = Builtins.sformat( - "date --date='1970-01-01 00:00:00 %1 seconds' +\"%%Y-%%m-%%d-%%H-%%M-%%S\"", - ctime - ) - out = Convert.to_map(SCR.Execute(path(".target.bash_output"), command)) - c_time = Ops.get_string(out, "stdout", "") - Builtins.y2debug("File %1: last change %2", filename, c_time) - c_time - end - - # Save current MBR to /boot/backup_mbr - # Also save to /var/lib/YaST2/backup_boot_sectors/%device, if some - # existing, rename it - # @param [String] device string name of device - def saveMBR(device) - device_file = Builtins.mergestring(Builtins.splitstring(device, "/"), "_") - device_file_path = Ops.add( - "/var/lib/YaST2/backup_boot_sectors/", - device_file - ) - device_file_path_to_logs = Ops.add("/var/log/YaST2/", device_file) - SCR.Execute( - path(".target.bash"), - "test -d /var/lib/YaST2/backup_boot_sectors || mkdir /var/lib/YaST2/backup_boot_sectors" - ) - if Ops.greater_than(SCR.Read(path(".target.size"), device_file_path), 0) - contents = Convert.convert( - SCR.Read(path(".target.dir"), "/var/lib/YaST2/backup_boot_sectors"), - :from => "any", - :to => "list <string>" - ) - contents = Builtins.filter(contents) do |c| - Builtins.regexpmatch( - c, - Builtins.sformat("%1-.*-.*-.*-.*-.*-.*", device_file) - ) - end - contents = Builtins.sort(contents) - index = 0 - siz = Builtins.size(contents) - while Ops.less_than(Ops.add(index, 10), siz) - SCR.Execute( - path(".target.remove"), - Builtins.sformat( - "/var/lib/YaST2/backup_boot_sectors/%1", - Ops.get(contents, index, "") - ) - ) - index = Ops.add(index, 1) - end - change_date = getFileChangeDate(device_file_path) - SCR.Execute( - path(".target.bash"), - Builtins.sformat("/bin/mv %1 %1-%2", device_file_path, change_date) - ) - end - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - device_file_path - ) - ) - # save MBR to yast2 log directory - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - device_file_path_to_logs - ) - ) - if device == @mbrDisk - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - "/boot/backup_mbr" - ) - ) - - # save thinkpad MBR - if ThinkPadMBR(device) - device_file_path_thinkpad = Ops.add(device_file_path, "thinkpadMBR") - Builtins.y2milestone("Backup thinkpad MBR") - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "cp %1 %2 2>&1", - device_file_path, - device_file_path_thinkpad - ) - ) - end - end - - nil - end - - # Update contents of MBR (active partition and booting code) - # FIXME move tis function to lilolike.ycp - # @return [Boolean] true on success - def updateMBR - # FIXME: do the real thing in perl_Bootloader - if getLoaderType(false) == "grub" - @activate = Ops.get(@globals, "activate", "false") == "true" - @repl_mbr = Ops.get(@globals, "generic_mbr", "false") == "true" - end - - Builtins.y2milestone( - "Updating disk system area, activate partition: %1, replace MBR: %2", - @activate, - @repl_mbr - ) - if @backup_mbr - Builtins.y2milestone( - "Doing MBR backup: MBR Disk: %1, loader device: %2", - @mbrDisk, - @loader_device - ) - disks_to_rewrite = Convert.convert( - Builtins.toset( - Builtins.merge(getMbrsToRewrite, [@mbrDisk, @loader_device]) - ), - :from => "list", - :to => "list <string>" - ) - Builtins.y2milestone( - "Creating backup of boot sectors of %1", - disks_to_rewrite - ) - Builtins.foreach(disks_to_rewrite) { |d| saveMBR(d) } - end - ret = true - # if the bootloader stage 1 is not installed in the MBR, but - # ConfigureLocation() asked us to replace some problematic existing - # MBR, then overwrite the boot code (only, not the partition list!) in - # the MBR with a generic (currently DOS?) bootloader - if @repl_mbr && @loader_device != @mbrDisk - PackageSystem.Install("syslinux") if !Stage.initial - Builtins.y2milestone( - "Updating code in MBR: MBR Disk: %1, loader device: %2", - @mbrDisk, - @loader_device - ) - disks_to_rewrite = getMbrsToRewrite - Builtins.foreach(disks_to_rewrite) do |d| - Builtins.y2milestone("Copying generic MBR code to %1", d) - # added fix 446 -> 440 Vista booting problem bnc # 396444 - command = Builtins.sformat( - "/bin/dd bs=440 count=1 if=%1 of=%2", - "/usr/share/syslinux/mbr.bin", - d - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), command) - ) - exit = Ops.get_integer(out, "exit", 0) - Builtins.y2milestone("Command output: %1", out) - ret = ret && 0 == exit - end - end - - Builtins.foreach(getPartitionsToActivate) do |m_activate| - num = Ops.get_integer(m_activate, "num", 0) - mbr_dev = Ops.get_string(m_activate, "mbr", "") - if num != 0 && mbr_dev != "" - # if primary partition - if !Ops.is_integer?(num) || Ops.less_or_equal(num, 4) - Builtins.y2milestone("Activating partition %1 on %2", num, mbr_dev) - # FIXME: this is the most rotten code since molded sliced bread - # move to bootloader/Core/GRUB.pm or similar - # TESTME: make sure that parted does not destroy BSD - # slices (#suse24740): cf. section 5.1 of "info parted": - # Parted only supports the BSD disk label system. - # Parted is unlikely to support the partition slice - # system in the future because the semantics are rather - # strange, and don't work like "normal" partition tables - # do. - # string command = sformat - # ("/usr/sbin/parted -s %1 set %2 boot on", mbr_dev, num); - # As a workaround for #167602, moved back to - # /sbin/activate, because it does not cause the kernel to - # forget about an activated extended partition (it changes - # the data on disk without using any ioctl). - # FIXME: investigate proper handling of the activate flag - # (kernel ioctls in parted etc.) and fix parted - command = Builtins.sformat( - "/usr/sbin/parted -s %1 set %2 boot on", - mbr_dev, - num - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - WFM.Execute(path(".local.bash_output"), command) - ) - exit = Ops.get_integer(out, "exit", 0) - Builtins.y2milestone("Command output: %1", out) - ret = ret && 0 == exit - end - else - Builtins.y2error("Cannot activate %1", m_activate) - end - end if @activate - ret - end - # Rewrite current MBR with /var/lib/YaST2/backup_boot_sectors/%device # Warning!!! don't use for bootsectors, 440 bytes of sector are written # @param [String] device string device to rewrite MBR to @@ -1052,21 +836,6 @@ @additional_failsafe_params end - # Get additional kernel parameters from control file - # @return [String] additional kernel parameters - def GetAdditionalKernelParams - ProductFeatures.GetStringFeature( - "globals", - "additional_kernel_parameters" - ) - end - - # Get additional kernel parameters splitted to a list - # @return a list of additional kernel parameters - def ListAdditionalKernelParams - ListKernelParamsInLine(GetAdditionalKernelParams()) - end - # Update graphical bootloader to contain help text of current language # And make the selected installation language default # @return [Boolean] true on success diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/popups.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/popups.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/popups.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/popups.rb 2014-04-22 11:18:41.000000000 +0200 @@ -41,20 +41,6 @@ end # Display question - # @param [String] name string name of currently selected section (to clone) - # @return [Boolean] true if answered yes - def askClone(name) - # yes-no popup - Popup.YesNo( - Builtins.sformat( - _( - "Clone the selected section '%1' instead\nof creating a new empty section?\n" - ), - name - ) - ) - end - # Display question # @return [Boolean] true if answered yes def confirmAbortPopup # yes-no popup question @@ -66,17 +52,6 @@ end # Display question - # @return [Boolean] true if answered yes - def resetSectsPopup - # yes-no popup question - Popup.YesNo( - _( - "Really reset your settings for sections?\nAll your changes made in section management will be lost.\n" - ) - ) - end - - # Display question # @param [String] title string section title # @return [Boolean] true if answered yes def confirmSectionDeletePopup(title) @@ -84,23 +59,6 @@ Popup.YesNo(Builtins.sformat(_("Really delete section %1?"), title)) end - # Display question - # @return [Boolean] true if answered yes - def resetAllPopup - # yes-no popup question - Popup.YesNo( - _("Really reset all\nyour settings? All your changes will be lost.\n") - ) - end - - # Display error - def setLocationErrorPopup - # error popup - Report.Error(_("Set the boot loader location.")) - - nil - end - # Display error def emptyPasswdErrorPopup # error popup @@ -274,24 +232,6 @@ ) end - - # Display popup - def displayGfxMenuChangePopup - # message popup, gfxmenu is option name, leave as is - Popup.Message( - _("The disk settings have changed.\nCheck the gfxmenu settings.\n") - ) - - nil - end - - # Display yes-no popup - # @return true if confirmed - def confirmOptionDeletePopup - # yes-no popup - Popup.YesNo(_("Really delete the selected option?")) - end - # Display error popup with log # @param [String] header string error header # @param [String] log string logfile contents @@ -321,50 +261,6 @@ nil end - - # Display popup - def displayNoSupportPopup - # message popup - Popup.Message(_("Sorry, there are currently\nno options to set here.")) - - nil - end - - # Display popup - def noBootloaderPopup - # error report - Report.Error(_("Unable to install the boot loader.")) - - nil - end - - # Display popup - # @param [String] bootloader string printable name of used bootloader - def floppyWrittenPopup(bootloader) - confirm_boot_msg = Misc.boot_msg - # data saved to floppy disk - # popup, %1 is bootloader name - msg = Builtins.sformat( - _("The %1 boot sector has been written to the floppy disk."), - bootloader - ) - msg = Ops.add( - Ops.add(msg, "\n"), - # popup - continuing - alternative 1 ... - _( - "Leave the floppy disk in the drive. The system will now be rebooted." - ) - ) - - if Ops.greater_than(Builtins.size(confirm_boot_msg), 0) - msg = Ops.add(Ops.add(msg, "\n\n"), confirm_boot_msg) - end - Misc.boot_msg = "" - # empty that Misc::boot_msg indicate the message has been displayed - Popup.TimedOKCancel(msg, 10) - - nil - end # Display popup - confirmation befopre restoring MBR # @param [String] device string device to restore to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/wizards.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/wizards.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/wizards.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/wizards.rb 2014-04-22 11:18:41.000000000 +0200 @@ -38,7 +38,6 @@ ) ) end - bl = Bootloader.getLoaderType # run generic sequence aliases = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/lib/bootloader/grub2base.rb new/yast2-bootloader-3.1.29/src/lib/bootloader/grub2base.rb --- old/yast2-bootloader-3.1.21/src/lib/bootloader/grub2base.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/lib/bootloader/grub2base.rb 2014-04-22 11:18:41.000000000 +0200 @@ -53,8 +53,6 @@ def Update Read(true, true) - #we don't handle sections, grub2 section create them for us - #BootCommon::UpdateSections (); BootCommon.UpdateGlobals nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootCommon.rb new/yast2-bootloader-3.1.29/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.21/src/modules/BootCommon.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootCommon.rb 2014-04-22 11:18:41.000000000 +0200 @@ -48,14 +48,6 @@ # map of global options and types for new perl-Bootloader interface @global_options = {} - # map of section options and types for new perl-Bootloader interface - @section_options = {} - - # boolean value indicate if "/" is on logical - # and primary /boot doesn't exist - - @boot_device_on_logical = false - # map of global options and values @globals = {} @@ -107,39 +99,21 @@ @current_section = {} - # Option types for different bootloaders - @opt_types = {} - # device holding MBR for bootloader @mbrDisk = "" - # was currently edited section changed (== true) - @one_section_changed = false - # Backup original MBR before installing bootloader @backup_mbr = false # Activate bootloader partition during installation? @activate = false - - # FATE #303548 - Grub: limit device.map to devices detected by BIOS - # Ask user if he wants to edit again bootloader settings - # It is used if device.map is limited and "boot" disk is out of range - # The range is the first 8 devices - @ask_user = false - - # Replace MBR with generic code after bootloader installation? - @repl_mbr = false - # Kernel parameters at previous detection @kernelCmdLine = "" # were settings changed (== true) @changed = false - - @edited_files = {} # common variables # type of bootloader to configure/being configured @@ -163,9 +137,6 @@ # summary dialog state - # Show verbose summary output - @verbose = false - # ui help variables @@ -194,8 +165,6 @@ @location_changed = false # Were configuration files manually edited and chamged? @files_edited = false - # Has been files edited warning already shown? - @files_edited_warned = false # time of last change of partitioning @partitioning_last_change = 0 # true if memtest was removed by user (manually) during the installation @@ -272,37 +241,6 @@ ret end - - # Get the size of memory for XEN's domain 0 - # @return the memory size in kB - def Dom0MemorySize - memory = Convert.convert( - SCR.Read(path(".probe.memory")), - :from => "any", - :to => "list <map>" - ) - - Builtins.y2milestone("memory: %1", memory) - memory_size = 0 - - Builtins.foreach(memory) do |info| - # internal class, main memory - if Ops.get_integer(info, "class_id", 0) == 257 && - Ops.get_integer(info, "sub_class_id", 0) == 2 - minf = Ops.get_list(info, ["resource", "phys_mem"], []) - Builtins.foreach(minf) do |i| - memory_size = Ops.add(memory_size, Ops.get_integer(i, "range", 0)) - end - end - end - - # size in kB lowered 64 MB for XEN itself - memory_size = Ops.subtract(Ops.divide(memory_size, 1024), 64 * 1024) - Builtins.y2milestone("Memory size for XEN domain 0: %1", memory_size) - memory_size - end - - # Create section for linux kernel # @param [String] title string the section name to create (untranslated) # @return a map describing the section @@ -506,7 +444,6 @@ "device_map" => BootStorage.remapDeviceMap(BootStorage.device_mapping) } if !(@loader_type == "grub" || @loader_type == "grub2") - Ops.set(exp, "repl_mbr", @repl_mbr) Ops.set(exp, "activate", @activate) end @@ -521,11 +458,7 @@ @globals = Ops.get_map(settings, "global", {}) @sections = Ops.get_list(settings, "sections", []) - # FIXME: for grub, repl_mbr is replaced by globals["generic_mbr"]; same - # for activate; remove the following when no bootloader uses these - # variables any more if !(@loader_type == "grub" || @loader_type == "grub2") - @repl_mbr = Ops.get_boolean(settings, "repl_mbr", false) @activate = Ops.get_boolean(settings, "activate", false) end BootStorage.device_mapping = Ops.get_map(settings, "device_map", {}) @@ -595,7 +528,6 @@ @sections = [] @globals = {} # DetectDisks (); - @repl_mbr = false @activate = false @activate_changed = false @removed_sections = [] @@ -769,75 +701,15 @@ # Display bootloader summary # @return a list of summary lines def Summary - if getLoaderType(false) == "none" + bl = getLoaderType(false) + if bl == "none" return [ HTML.Colorize(getLoaderName(getLoaderType(false), :summary), "red") ] end - targetMap = Storage.GetTargetMap - boot_target = Ops.get_map(targetMap, @loader_device, {}) - target_name = "" - if boot_target == {} - target_name = @loader_device - if target_name == "mbr_md" - mbrs = Builtins.maplist( - Md2Partitions(BootStorage.BootPartitionDevice) - ) do |d, id| - p_dev = Storage.GetDiskPartition(d) - Ops.get_string(p_dev, "disk", "") - end - # summary part, %1 is a list of device names - target_name = Builtins.sformat( - _("Master boot records of disks %1"), - Builtins.mergestring(mbrs, ", ") - ) - end - else - target_name = Ops.get_string(boot_target, "name", "disk") - end - target_name = AddMbrToDescription(target_name, @loader_device) - - result = [] - # summary text, %1 is bootloader name (eg. LILO) - result = Builtins.add( - result, - Builtins.sformat( - _("Boot Loader Type: %1"), - getLoaderName(getLoaderType(false), :summary) - ) - ) - # summary text, location is location description (eg. /dev/hda) - result = Builtins.add( - result, - Builtins.sformat(_("Location: %1"), target_name) - ) - sects = [] - Builtins.foreach(@sections) do |s| - title = Ops.get_string(s, "name", "") - # section name "suffix" for default section - _def = title == Ops.get(@globals, "default", "") ? _(" (default)") : "" - sects = Builtins.add( - sects, - String.EscapeTags(Builtins.sformat("+ %1%2", title, _def)) - ) - end - # summary text. %1 is list of bootloader sections - result = Builtins.add( - result, - Builtins.sformat( - _("Sections:<br>%1"), - Builtins.mergestring(sects, "<br>") - ) - ) - if @loader_device == "/dev/null" - # summary text - result = Builtins.add( - result, - _("Do not install boot loader; just create \nconfiguration files") - ) - end - deep_copy(result) + # each Boot* should have own summary, that can differ + raise "Not implemented for bootloader \"#{bl}\"" end # Update read settings to new version of configuration files @@ -1106,7 +978,7 @@ ) end end - if Arch.s390 + if Arch.s390 || Arch.ppc ret = ["grub2"] end # in order not to display it twice when "none" is selected @@ -1151,8 +1023,6 @@ end publish :variable => :global_options, :type => "map <string, any>" - publish :variable => :section_options, :type => "map <string, any>" - publish :variable => :boot_device_on_logical, :type => "boolean" publish :variable => :globals, :type => "map <string, string>" publish :variable => :sections, :type => "list <map <string, any>>" publish :variable => :cached_settings_base_data_change_time, :type => "integer" @@ -1163,19 +1033,13 @@ publish :variable => :current_section_name, :type => "string" publish :variable => :current_section_index, :type => "integer" publish :variable => :current_section, :type => "map <string, any>" - publish :variable => :opt_types, :type => "map <string, map <string, string>>" publish :variable => :mbrDisk, :type => "string" - publish :variable => :one_section_changed, :type => "boolean" publish :variable => :backup_mbr, :type => "boolean" publish :variable => :activate, :type => "boolean" - publish :variable => :ask_user, :type => "boolean" - publish :variable => :repl_mbr, :type => "boolean" publish :variable => :kernelCmdLine, :type => "string" publish :variable => :changed, :type => "boolean" - publish :variable => :edited_files, :type => "map <string, string>" publish :variable => :del_parts, :type => "list <string>" publish :variable => :write_settings, :type => "map" - publish :variable => :verbose, :type => "boolean" publish :variable => :other_bl, :type => "map" publish :variable => :activate_changed, :type => "boolean" publish :variable => :save_all, :type => "boolean" @@ -1183,12 +1047,9 @@ publish :variable => :was_read, :type => "boolean" publish :variable => :location_changed, :type => "boolean" publish :variable => :files_edited, :type => "boolean" - publish :variable => :files_edited_warned, :type => "boolean" publish :variable => :partitioning_last_change, :type => "integer" publish :variable => :removed_sections, :type => "list <string>" - publish :variable => :read_default_section_name, :type => "string" publish :variable => :update_section_types, :type => "list <string>" - publish :variable => :bootloaders, :type => "list <string>" publish :variable => :enable_md_array_redundancy, :type => "boolean" publish :variable => :enable_selinux, :type => "boolean" publish :function => :getLoaderType, :type => "string (boolean)" @@ -1218,17 +1079,13 @@ publish :function => :getKernelParamFromLine, :type => "string (string, string)" publish :function => :setKernelParamToLine, :type => "string (string, string, string)" publish :function => :myToInteger, :type => "integer (any)" - publish :function => :updateMBR, :type => "boolean ()" publish :function => :restoreMBR, :type => "boolean (string)" publish :function => :UpdateKernelParams, :type => "string (string)" publish :function => :getSwapPartitions, :type => "map <string, integer> ()" publish :function => :translateSectionTitle, :type => "string (string)" publish :function => :UpdateInstallationKernelParameters, :type => "void ()" publish :function => :GetAdditionalFailsafeParams, :type => "string ()" - publish :function => :GetAdditionalKernelParams, :type => "string ()" - publish :function => :ListAdditionalKernelParams, :type => "list <string> ()" publish :function => :UpdateGfxMenuContents, :type => "boolean ()" - publish :function => :MemtestPresent, :type => "boolean ()" publish :function => :BootloaderInstallable, :type => "boolean ()" publish :function => :PartitionInstallable, :type => "boolean ()" publish :function => :findRelativeDefaultLinux, :type => "string ()" @@ -1240,23 +1097,17 @@ publish :function => :GetSerialFromAppend, :type => "void ()" publish :function => :UpdateProposalFromClient, :type => "boolean ()" publish :function => :DiskOrderSummary, :type => "string ()" - publish :function => :DisksChanged, :type => "boolean ()" - publish :function => :KeepMBR, :type => "boolean (string)" publish :function => :AddFirmwareToBootloader, :type => "boolean (string)" - publish :function => :i386Summary, :type => "list <string> ()" - publish :function => :i386LocationProposal, :type => "void ()" publish :function => :PostUpdateMBR, :type => "boolean ()" publish :function => :FindMBRDisk, :type => "string ()" publish :function => :Md2Partition, :type => "string (string)" publish :function => :RunDelayedUpdates, :type => "void ()" publish :function => :FixGlobals, :type => "void ()" publish :function => :FixSections, :type => "void (void ())" - publish :function => :UpdateSections, :type => "void ()" publish :function => :UpdateGlobals, :type => "void ()" publish :function => :RemoveUnexistentSections, :type => "void (string, string)" publish :function => :UpdateAppend, :type => "void ()" publish :function => :UpdateGfxMenu, :type => "void ()" - publish :function => :DefineMultipath, :type => "boolean (map <string, string>)" publish :function => :SetDiskInfo, :type => "void ()" publish :function => :InitializeLibrary, :type => "boolean (boolean, string)" publish :function => :SetSections, :type => "boolean (list <map <string, any>>)" @@ -1264,18 +1115,14 @@ publish :function => :SetGlobal, :type => "boolean (map <string, string>)" publish :function => :GetGlobal, :type => "map <string, string> ()" publish :function => :SetDeviceMap, :type => "boolean (map <string, string>)" - publish :function => :GetDeviceMap, :type => "map <string, string> ()" - publish :function => :bootloaderError, :type => "void (string)" publish :function => :ReadFiles, :type => "boolean (boolean)" publish :function => :CommitSettings, :type => "boolean ()" publish :function => :UpdateBootloader, :type => "boolean ()" - publish :function => :SetSecureBoot, :type => "boolean (boolean)" publish :function => :InitializeBootloader, :type => "boolean ()" publish :function => :GetFilesContents, :type => "map <string, string> ()" publish :function => :SetFilesContents, :type => "boolean (map <string, string>)" publish :function => :XenPresent, :type => "boolean ()" publish :function => :isTrustedGrub, :type => "boolean ()" - publish :function => :Dom0MemorySize, :type => "integer ()" publish :function => :Export, :type => "map ()" publish :function => :Import, :type => "boolean (map)" publish :function => :Read, :type => "boolean (boolean, boolean)" @@ -1284,7 +1131,6 @@ publish :function => :Save, :type => "boolean (boolean, boolean, boolean)" publish :function => :Update, :type => "void ()" publish :function => :Write, :type => "boolean ()" - publish :function => :setCurrentLoaderAttribs, :type => "void (string)" publish :function => :setLoaderType, :type => "void (string)" publish :function => :setSystemSecureBootStatus, :type => "void (boolean)" publish :function => :Section2Index, :type => "integer (string)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB.rb 2014-04-22 11:18:41.000000000 +0200 @@ -799,7 +799,6 @@ def Update Read(true, true) - BootCommon.UpdateSections BootCommon.UpdateGlobals nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB2.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb 2014-04-22 11:18:41.000000000 +0200 @@ -122,10 +122,7 @@ BootCommon.globals["boot_custom"] = partition when /s390/ - zipl_partition = Storage.GetEntryForMountpoint("/boot/zipl") - raise "missing separate /boot/zipl partition" if zipl_partition.empty? - - BootCommon.globals["boot_custom"] = zipl_partition["device"] + Builtins.y2milestone "no partition needed for grub2 on s390" else raise "unsuported architecture #{Arch.architecture}" end @@ -140,7 +137,7 @@ end prep_partitions = partitions.select do |partition| - partition["fsid"] == 0x41 + [0x41, 0x108].include? partition["fsid"] end y2milestone "detected prep partitions #{prep_partitions.inspect}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB2EFI.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB2EFI.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB2EFI.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB2EFI.rb 2014-04-22 11:18:41.000000000 +0200 @@ -103,14 +103,15 @@ # Constructor def BootGRUB2EFI - if Arch.i386 + if Arch.i386 packages = ["grub2-i386-efi"] elsif Arch.x86_64 packages = ["grub2-x86_64-efi", "shim", "mokutil"] else - raise "no grub packages for EFI available for this architecture" + # do not raise exception as we call constructor everywhere even if it doesn't make sense + packages = [] end - + Ops.set( BootCommon.bootloader_attribs, "grub2-efi", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootSupportCheck.rb new/yast2-bootloader-3.1.29/src/modules/BootSupportCheck.rb --- old/yast2-bootloader-3.1.21/src/modules/BootSupportCheck.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootSupportCheck.rb 2014-04-22 11:18:41.000000000 +0200 @@ -225,20 +225,9 @@ ) end end - if Ops.get(p, "used_fs") == :xfs - AddNewProblem( - _( - "The /boot directory is on an XFS filesystem. System may not boot." - ) - ) - Builtins.y2error("The /boot directory is on an XFS filesystem") - result = false - raise Break - else - found_boot = true - Builtins.y2milestone("/boot filesystem is OK") - raise Break - end + found_boot = true + Builtins.y2milestone("/boot filesystem is OK") + raise Break end end raise Break if !result || found_boot @@ -263,22 +252,32 @@ # @return [Boolean] true on success def CheckBios_ID - ret = true + return true if Arch.s390 # s390 do not have bios boot order (bnc#874106) + if BootStorage.bois_id_missing AddNewProblem( _( "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\"" ) ) - ret = false + return false end - ret + + return true end - # Check that the root partition is reachable - def RootPartition - true + def check_zipl_part + boot_part = Storage.GetEntryForMountpoint("/boot/zipl") + boot_part = Storage.GetEntryForMountpoint("/boot") if boot_part.empty? + boot_part = Storage.GetEntryForMountpoint("/") if boot_part.empty? + + if [:ext2, :ext3, :ext4].include? boot_part["used_fs"] + return true + else + AddNewProblem(_( "Missing ext partition for booting. Cannot install boot code.")) + return false + end end # GRUB-related check @@ -291,7 +290,9 @@ # GRUB2-related check def GRUB2 - GRUB() + ret = GRUB() + # ensure that s390 have ext* partition for booting (bnc#873951) + ret &&= check_zipl_part if Arch.s390 end # GRUB2EFI-related check @@ -315,9 +316,6 @@ # detect correct bootloader type supported = CorrectLoaderType() && supported - # check whether root partition can be reached - supported = RootPartition() && supported - # check specifics for individual loaders if lt == "grub" supported = GRUB() && supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/Bootloader.rb new/yast2-bootloader-3.1.29/src/modules/Bootloader.rb --- old/yast2-bootloader-3.1.21/src/modules/Bootloader.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/Bootloader.rb 2014-04-22 11:18:41.000000000 +0200 @@ -1050,16 +1050,27 @@ elsif section == "LINUX_DEFAULT" section = getProposedDefaultSection end - return false if section == nil + if section.nil? + Builtins.y2error("section is nil, so kernel parameter cannot be set") + return false + end + sectnum = -1 index = -1 Builtins.foreach(BootCommon.sections) do |s| - index = Ops.add(index, 1) + index += 1 sectnum = index if Ops.get_string(s, "name", "") == section end - return false if sectnum == -1 - slabel = "" - return false if (key == "vga" || key == "root") && value == "true" + if sectnum == -1 + Builtins.y2error "Cannot find given section #{section} in sections #{BootCommon.sections.inspect}" + return false + end + + if (key == "vga" || key == "root") && value == "true" + Builtins.y2error "invalid values passed as kernel param #{key.inspect} => #{value.inspect}" + return false + end + if Builtins.contains(["root", "vga"], key) if value != "false" if key == "vga" @@ -1095,8 +1106,8 @@ Ops.set(BootCommon.sections, [sectnum, "__changed"], true) end BootCommon.changed = true - ret = true - ret + + return true end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit firmwarekit for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package firmwarekit for openSUSE:Factory checked in at 2014-04-26 11:45:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firmwarekit (Old) and /work/SRC/openSUSE:Factory/.firmwarekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "firmwarekit" Changes: -------- --- /work/SRC/openSUSE:Factory/firmwarekit/firmwarekit.changes 2012-03-20 11:26:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.firmwarekit.new/firmwarekit.changes 2014-04-26 11:45:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 21 09:11:01 UTC 2014 - coolo(a)suse.com + +- remove buildrequire on sysvinit - not needed at all + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firmwarekit.spec ++++++ --- /var/tmp/diff_new_pack.HekW6c/_old 2014-04-26 11:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.HekW6c/_new 2014-04-26 11:45:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package firmwarekit # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,46 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: firmwarekit -BuildRequires: bash coreutils dhcp-client findutils gawk gdb glib2-devel -BuildRequires: grep iproute2 module-init-tools ncurses-devel newt newt-devel -BuildRequires: perl pkgconfig sed sharutils slang-devel sysvinit -BuildRequires: acpica dmidecode -BuildRequires: termcap util-linux wget xorg-x11-util-devel +BuildRequires: acpica +BuildRequires: bash +BuildRequires: coreutils +BuildRequires: dhcp-client +BuildRequires: dmidecode +BuildRequires: findutils +BuildRequires: gawk +BuildRequires: gdb +BuildRequires: glib2-devel +BuildRequires: grep +BuildRequires: iproute2 +BuildRequires: module-init-tools +BuildRequires: ncurses-devel +BuildRequires: newt +BuildRequires: newt-devel +BuildRequires: perl +BuildRequires: pkgconfig +BuildRequires: sed +BuildRequires: sharutils +BuildRequires: slang-devel +BuildRequires: termcap +BuildRequires: util-linux +BuildRequires: wget +BuildRequires: xorg-x11-util-devel Url: http://www.linuxfirmwarekit.org Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines -Version: 3 -Release: 45 License: LGPL-2.1+ Group: System/Boot -AutoReqProv: on +Version: 3 +Release: 0 PreReq: gzip -Requires: acpica dmidecode -Requires: hwinfo util-linux powertop +Requires: acpica +Requires: dmidecode +Requires: hwinfo +Requires: powertop +Requires: util-linux Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines +Group: System/Boot BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 Source0: %{name}-r%{version}.tar.bz2 @@ -61,12 +81,6 @@ related bugs. If you have an ACPI error/warning, run this tool and provide output for bug tracking information - - -Authors: --------- - Intel - %prep %setup -q -n linuxfirmwarekit %patch0 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2014-04-26 11:45:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2014-04-13 13:13:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2014-04-26 11:45:08.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 08:34:35 UTC 2014 - mfilka(a)suse.com + +- bnc#872903 + - fixed internal error (missing IsManaged method) +- 3.1.22 + +------------------------------------------------------------------- Old: ---- yast2-users-3.1.21.tar.bz2 New: ---- yast2-users-3.1.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.PWOx9u/_old 2014-04-26 11:45:09.000000000 +0200 +++ /var/tmp/diff_new_pack.PWOx9u/_new 2014-04-26 11:45:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.1.21.tar.bz2 -> yast2-users-3.1.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/package/yast2-users.changes new/yast2-users-3.1.22/package/yast2-users.changes --- old/yast2-users-3.1.21/package/yast2-users.changes 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/package/yast2-users.changes 2014-04-18 10:43:45.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 08:34:35 UTC 2014 - mfilka(a)suse.com + +- bnc#872903 + - fixed internal error (missing IsManaged method) +- 3.1.22 + +------------------------------------------------------------------- Thu Apr 4 15:06:27 UTC 2014 - ckornacker(a)suse.com - hide Kerberos passwords from process list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/package/yast2-users.spec new/yast2-users-3.1.22/package/yast2-users.spec --- old/yast2-users-3.1.21/package/yast2-users.spec 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/package/yast2-users.spec 2014-04-18 10:43:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/src/clients/inst_auth.rb new/yast2-users-3.1.22/src/clients/inst_auth.rb --- old/yast2-users-3.1.21/src/clients/inst_auth.rb 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/src/clients/inst_auth.rb 2014-04-18 10:43:45.000000000 +0200 @@ -69,7 +69,7 @@ Builtins.y2debug("net_devices: %1", @net_devices) @found = Ops.greater_than(Builtins.size(@net_devices), 0) || - NetworkService.IsManaged + NetworkService.is_network_manager if !@found && Builtins.size(Ldap.initial_defaults) == 0 Builtins.y2milestone( -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation-control for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-installation-control for openSUSE:Factory checked in at 2014-04-26 11:45:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old) and /work/SRC/openSUSE:Factory/.yast2-installation-control.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation-control" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes 2014-04-05 14:43:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation-control.new/yast2-installation-control.changes 2014-04-26 11:45:07.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 10:17:58 CEST 2014 - locilka(a)suse.com + +- Added software->default_patterns - patterns selected for + installation by default (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-installation-control-3.1.5.tar.bz2 New: ---- yast2-installation-control-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation-control.spec ++++++ --- /var/tmp/diff_new_pack.97P9ri/_old 2014-04-26 11:45:08.000000000 +0200 +++ /var/tmp/diff_new_pack.97P9ri/_new 2014-04-26 11:45:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-control-3.1.5.tar.bz2 -> yast2-installation-control-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/control/control.rnc new/yast2-installation-control-3.1.6/control/control.rnc --- old/yast2-installation-control-3.1.5/control/control.rnc 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/control/control.rnc 2014-04-18 10:42:40.000000000 +0200 @@ -259,6 +259,7 @@ | software_packages | kernel_packages | packages_transmogrify + | default_patterns ## Whether it is allowed to delete a package during upgrade delete_old_packages = element delete_old_packages { BOOLEAN } @@ -368,6 +369,9 @@ element package { text }+ } +## Comma and/or space-separated list of default patterns selected for installation +default_patterns = element default_patterns { text } + ## Software / Package-manager related variables software = element software { software_elements* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/control/control.rng new/yast2-installation-control-3.1.6/control/control.rng --- old/yast2-installation-control-3.1.5/control/control.rng 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/control/control.rng 2014-04-18 10:42:40.000000000 +0200 @@ -496,6 +496,7 @@ <ref name="software_packages"/> <ref name="kernel_packages"/> <ref name="packages_transmogrify"/> + <ref name="default_patterns"/> </choice> </define> <define name="delete_old_packages"> @@ -770,6 +771,12 @@ </oneOrMore> </element> </define> + <define name="default_patterns"> + <a:documentation>Comma and/or space-separated list of default patterns selected for installation</a:documentation> + <element name="default_patterns"> + <text/> + </element> + </define> <define name="software"> <a:documentation>Software / Package-manager related variables</a:documentation> <element name="software"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/package/yast2-installation-control.changes new/yast2-installation-control-3.1.6/package/yast2-installation-control.changes --- old/yast2-installation-control-3.1.5/package/yast2-installation-control.changes 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/package/yast2-installation-control.changes 2014-04-18 10:42:40.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 10:17:58 CEST 2014 - locilka(a)suse.com + +- Added software->default_patterns - patterns selected for + installation by default (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- Wed Apr 2 13:38:56 UTC 2014 - jreidinger(a)suse.com - add element for separate ssh service enablement (bnc#865056) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/package/yast2-installation-control.spec new/yast2-installation-control-3.1.6/package/yast2-installation-control.spec --- old/yast2-installation-control-3.1.5/package/yast2-installation-control.spec 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/package/yast2-installation-control.spec 2014-04-18 10:42:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-04-26 11:45:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-04-12 21:58:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-04-26 11:45:05.000000000 +0200 @@ -1,0 +2,35 @@ +Thu Apr 17 13:56:31 UTC 2014 - werner(a)suse.de + +- Extend avoid-divide-by-zero-sigtrap.patch to make the crash + handler know about SIGTRAP and SIGSYS + +------------------------------------------------------------------- +Thu Apr 17 13:37:06 UTC 2014 - werner(a)suse.de + +- Add avoid-divide-by-zero-sigtrap.patch which fixes bnc#867663 + that is a divide by zero on a jobless system + +------------------------------------------------------------------- +Wed Apr 16 10:17:13 UTC 2014 - werner(a)suse.de + +- Use latest regenerate-initrd rpm macros (fate#313506) +- Add rescue-emergency-target-conflicts.patch to avoid that + emergency and rescue sulogin are fighting on console + +------------------------------------------------------------------- +Tue Apr 15 12:19:24 UTC 2014 - werner(a)suse.de + +- Modify systemd-sleep-grub to let hybrid-sleep.target work even + on XEN, changes from Thomas Blume (bnc#873432) + +------------------------------------------------------------------- +Mon Apr 14 13:55:36 UTC 2014 - werner(a)suse.de + +- Add backported upstream patch + 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +- Add patch systemd-detect-xendom.patch from Thomas Blume + to be able to detect XEN dom0 as well as domU +- systemd conflicts with sysvinit, ven if the package systemd-sysvinit + does already conflict with sysvinit-init (bnc#873444) + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch avoid-divide-by-zero-sigtrap.patch rescue-emergency-target-conflicts.patch systemd-detect-xendom.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -45,6 +45,7 @@ BuildRequires: binutils-gold %endif %endif +BuildRequires: config(suse-module-tools) %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets %endif @@ -104,6 +105,9 @@ %endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) +%if 0%{?suse_version} > 1310 +Conflicts: sysvinit +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs @@ -375,6 +379,14 @@ Patch193: portmap-wants-rpcbind-socket.patch # PATCH-FIX-USTREAM added at 2014/03/11 Patch194: 0007-dbus-suppress-duplicate-and-misleading-messages.patch +# PATCH-FIX-USTREAM added at 2014/03/14 +Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +# PATCH-FIX-SUSE Detect XEN dom0 as well as domU +Patch196: systemd-detect-xendom.patch +# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console +Patch197: rescue-emergency-target-conflicts.patch +# PATCH-FIX-SUSE Avoid a divide by zero sigtrap +Patch198: avoid-divide-by-zero-sigtrap.patch # UDEV PATCHES # ============ @@ -463,6 +475,17 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} +Requires(post): sed +Requires(post): systemd +%if %{defined regenerate_initrd_post} +Requires(post): coreutils +Requires(postun): coreutils +Requires(posttrans): suse-module-tools +Requires(posttrans): /sbin/mkinitrd +%else +Requires(post): /sbin/mkinitrd +Requires(postun): /sbin/mkinitrd +%endif Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 @@ -737,6 +760,10 @@ %patch192 -p1 %patch193 -p1 %patch194 -p0 +%patch195 -p0 +%patch196 -p1 +%patch197 -p1 +%patch198 -p1 # udev patches %patch1001 -p1 @@ -1121,9 +1148,14 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi @@ -1135,12 +1167,22 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi +%if %{defined regenerate_initrd_post} +%posttrans -n %{udevpkgname} +%regenerate_initrd_posttrans +%endif + %post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig %postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -40,6 +40,7 @@ BuildRequires: binutils-gold %endif %endif +BuildRequires: config(suse-module-tools) %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets %endif @@ -99,6 +100,9 @@ %endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) +%if 0%{?suse_version} > 1310 +Conflicts: sysvinit +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs @@ -370,6 +374,14 @@ Patch193: portmap-wants-rpcbind-socket.patch # PATCH-FIX-USTREAM added at 2014/03/11 Patch194: 0007-dbus-suppress-duplicate-and-misleading-messages.patch +# PATCH-FIX-USTREAM added at 2014/03/14 +Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +# PATCH-FIX-SUSE Detect XEN dom0 as well as domU +Patch196: systemd-detect-xendom.patch +# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console +Patch197: rescue-emergency-target-conflicts.patch +# PATCH-FIX-SUSE Avoid a divide by zero sigtrap +Patch198: avoid-divide-by-zero-sigtrap.patch # UDEV PATCHES # ============ @@ -458,6 +470,17 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} +Requires(post): sed +Requires(post): systemd +%if %{defined regenerate_initrd_post} +Requires(post): coreutils +Requires(postun): coreutils +Requires(posttrans): suse-module-tools +Requires(posttrans): /sbin/mkinitrd +%else +Requires(post): /sbin/mkinitrd +Requires(postun): /sbin/mkinitrd +%endif Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 @@ -732,6 +755,10 @@ %patch192 -p1 %patch193 -p1 %patch194 -p0 +%patch195 -p0 +%patch196 -p1 +%patch197 -p1 +%patch198 -p1 # udev patches %patch1001 -p1 @@ -1116,9 +1143,14 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi @@ -1130,12 +1162,22 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi +%if %{defined regenerate_initrd_post} +%posttrans -n %{udevpkgname} +%regenerate_initrd_posttrans +%endif + %post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig %postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig ++++++ 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch ++++++ Based on b2103dccb354de3f38c49c14ccb637bdf665e40f Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Sat, 5 Apr 2014 13:59:01 -0400 Subject: [PATCH] reduce the amount of messages logged to /dev/kmsg when "debug" is specified --- src/core/main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- src/core/main.c +++ src/core/main.c 2014-04-14 13:50:48.490814738 +0000 @@ -412,12 +412,8 @@ static int parse_proc_cmdline_word(const if (arg_show_status == _SHOW_STATUS_UNSET) arg_show_status = SHOW_STATUS_AUTO; } else if (streq(word, "debug")) { - /* Log to kmsg, the journal socket will fill up before the - * journal is started and tools running during that time - * will block with every log message for for 60 seconds, - * before they give up. */ - log_set_max_level(LOG_DEBUG); - log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_KMSG); + if (detect_container(NULL) > 0) + log_set_target(LOG_TARGET_CONSOLE); } else if (!in_initrd()) { unsigned i; ++++++ avoid-divide-by-zero-sigtrap.patch ++++++ Nasty bug reported on bnc#867663 --- systemd-210/src/core/manager.c +++ systemd-210/src/core/manager.c 2014-04-17 13:29:07.366236714 +0000 @@ -1780,7 +1780,8 @@ static int manager_dispatch_jobs_in_prog assert(m); assert(source); - manager_print_jobs_in_progress(m); + if (m->n_running_jobs > 0) + manager_print_jobs_in_progress(m); next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC; r = sd_event_source_set_time(source, next); --- systemd-210/src/shared/def.h +++ systemd-210/src/shared/def.h 2014-04-17 13:47:10.946234983 +0000 @@ -37,7 +37,7 @@ #define SYSTEMD_CGROUP_CONTROLLER "name=systemd" -#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT +#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT,SIGTRAP,SIGSYS #define SIGNALS_IGNORE SIGPIPE #define DIGITS "0123456789" ++++++ rescue-emergency-target-conflicts.patch ++++++ --- systemd-210/units/emergency.target +++ systemd-210/units/emergency.target 2014-04-15 11:11:18.618235831 +0000 @@ -10,4 +10,5 @@ Description=Emergency Mode Documentation=man:systemd.special(7) Requires=emergency.service After=emergency.service +Conflicts=getty.target rescue.target AllowIsolate=yes --- systemd-210/units/rescue.target +++ systemd-210/units/rescue.target 2014-04-15 11:14:40.606808928 +0000 @@ -10,7 +10,8 @@ Description=Rescue Mode Documentation=man:systemd.special(7) Requires=sysinit.target rescue.service After=sysinit.target rescue.service -Conflicts=getty.target +Conflicts=getty.target emergency.target +Before=emergency.target AllowIsolate=yes [Install] ++++++ systemd-detect-xendom.patch ++++++ diff -Naur systemd-210/src/shared/virt.c systemd-210-mod/src/shared/virt.c --- systemd-210/src/shared/virt.c 2014-02-24 15:38:03.909784909 +0100 +++ systemd-210/src/shared/virt.c 2014-04-10 13:48:05.568766957 +0200 @@ -149,7 +149,7 @@ /* Returns a short identifier for the various VM implementations */ int detect_vm(const char **id) { - _cleanup_free_ char *hvtype = NULL, *cpuinfo_contents = NULL; + _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL; static thread_local int cached_found = -1; static thread_local const char *cached_id = NULL; const char *_id = NULL; @@ -166,13 +166,18 @@ /* Try high-level hypervisor sysfs file first: * * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */ - r = read_one_line_file("/sys/hypervisor/type", &hvtype); + r = read_one_line_file("/proc/xen/capabilities", &domcap); if (r >= 0) { - if (streq(hvtype, "xen")) { - _id = "xen"; + if (strstr(domcap, "control_d")) { + r = 0; + _id = "xen-dom0"; + } else { r = 1; - goto finish; + _id = "xen-domU"; } + + goto finish; + } else if (r != -ENOENT) return r; ++++++ systemd-sleep-grub ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -50,10 +50,10 @@ fi ;; - linux*noresume*) + linux*noresume*|module*xen*noresume*) echo " Skipping grub entry #${J}, because it has the noresume option" >&2 ;; - linux*root=*) + linux*root=*|module*xen*root=*) local ROOT ROOT=${LINE#*root=} DUMMY=($ROOT) @@ -77,7 +77,7 @@ # DEBUG "Found kernel entry #${I}: '${DUMMY[1]##*/}'" INFO let I++ ;; - linux*) + linux*|module*xen*) # a kernel without "root="? We better skip that one... echo " Skipping grub entry #${J}, because it has no root= option" >&2 ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-04-26 11:45:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2014-03-06 19:18:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-04-26 11:45:02.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 17 15:00:25 CEST 2014 - aschnell(a)suse.de + +- fixed parent of snapshot generated by rollback + +------------------------------------------------------------------- +Thu Apr 10 10:17:49 CEST 2014 - aschnell(a)suse.de + +- added rollback support (fate#317062) +- version 0.2.2 + +------------------------------------------------------------------- +Thu Apr 03 17:49:12 CEST 2014 - aschnell(a)suse.de + +- fixed execution of grub plugin (bnc#871880) + +------------------------------------------------------------------- +Tue Apr 01 20:04:33 CEST 2014 - aschnell(a)suse.de + +- allow to add snapshots subvolume to fstab (for fate#317062) + +------------------------------------------------------------------- @@ -30 +51 @@ -- 0.2.1 +- version 0.2.1 @@ -37 +58 @@ -- 0.2.0 +- version 0.2.0 @@ -54 +75 @@ -- 0.1.8 +- version 0.1.8 @@ -77 +98 @@ -- 0.1.7 +- version 0.1.7 @@ -88 +109 @@ -- 0.1.6 +- version 0.1.6 @@ -101 +122 @@ -- 0.1.5 +- version 0.1.5 Old: ---- snapper-0.2.1.tar.bz2 New: ---- snapper-0.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.pwTK3b/_old 2014-04-26 11:45:03.000000000 +0200 +++ /var/tmp/diff_new_pack.pwTK3b/_new 2014-04-26 11:45:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: snapper -Version: 0.2.1 +Version: 0.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -27,6 +27,12 @@ BuildRequires: libacl-devel BuildRequires: libtool BuildRequires: libxml2-devel +%if 0%{?suse_version} > 1230 +BuildRequires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +BuildRequires: libmount-devel >= 2.24 +%endif BuildRequires: pkg-config %if ! 0%{?mandriva_version} BuildRequires: dbus-1-devel @@ -75,6 +81,9 @@ ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} \ --docdir=%{prefix}/share/doc/packages/snapper \ +%if 0%{?suse_version} <= 1310 + --disable-rollback \ +%endif --disable-silent-rules --disable-ext4 make %{?jobs:-j%jobs} @@ -160,6 +169,12 @@ Requires: libsnapper2 = %version Requires: libstdc++-devel Requires: libxml2-devel +%if 0%{?suse_version} > 1230 +Requires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +Requires: libmount-devel >= 2.24 +%endif Summary: Header files and documentation for libsnapper Group: Development/Languages/C and C++ ++++++ snapper-0.2.1.tar.bz2 -> snapper-0.2.2.tar.bz2 ++++++ ++++ 3409 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-slp for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-slp for openSUSE:Factory checked in at 2014-04-26 11:45:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slp (Old) and /work/SRC/openSUSE:Factory/.yast2-slp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slp" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slp/yast2-slp.changes 2014-03-21 12:13:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-slp.new/yast2-slp.changes 2014-04-26 11:45:01.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 16 15:13:13 UTC 2014 - vmoravec(a)suse.com + +- Correct summary and description in spec file (bnc#868453) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-slp-3.1.5.tar.bz2 New: ---- yast2-slp-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.TJptcw/_old 2014-04-26 11:45:02.000000000 +0200 +++ /var/tmp/diff_new_pack.TJptcw/_new 2014-04-26 11:45:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,14 +39,13 @@ Requires: yast2 Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - SLP Agent and Browser +Summary: YaST2 - SLP Agent and Library License: GPL-2.0+ Group: System/YaST Url: https://github.com/yast/yast-slp %description -This module enables YaST modules to register services with SLP. -Additionally, it offers a simple browser of SLP registered services. +This package provides YaST modules to lookup/advertise services with SLP. %prep %setup -n %{name}-%{version} ++++++ yast2-slp-3.1.5.tar.bz2 -> yast2-slp-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.5/package/yast2-slp.changes new/yast2-slp-3.1.6/package/yast2-slp.changes --- old/yast2-slp-3.1.5/package/yast2-slp.changes 2014-03-11 10:24:19.000000000 +0100 +++ new/yast2-slp-3.1.6/package/yast2-slp.changes 2014-04-16 16:27:35.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 16 15:13:13 UTC 2014 - vmoravec(a)suse.com + +- Correct summary and description in spec file (bnc#868453) +- 3.1.6 + +------------------------------------------------------------------- Mon Mar 10 14:13:13 UTC 2014 - vmoravec(a)suse.com - Fix dns resolution exception (bnc#867357) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.5/package/yast2-slp.spec new/yast2-slp-3.1.6/package/yast2-slp.spec --- old/yast2-slp-3.1.5/package/yast2-slp.spec 2014-03-11 10:24:19.000000000 +0100 +++ new/yast2-slp-3.1.6/package/yast2-slp.spec 2014-04-16 16:27:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,12 +34,11 @@ Requires: openslp yast2 Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - SLP Agent and Browser +Summary: YaST2 - SLP Agent and Library Url: https://github.com/yast/yast-slp %description -This module enables YaST modules to register services with SLP. -Additionally, it offers a simple browser of SLP registered services. +This package provides YaST modules to lookup/advertise services with SLP. %prep %setup -n %{name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-hardware-detection for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-hardware-detection for openSUSE:Factory checked in at 2014-04-26 11:44:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-hardware-detection (Old) and /work/SRC/openSUSE:Factory/.yast2-hardware-detection.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-hardware-detection" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-hardware-detection/yast2-hardware-detection.changes 2013-11-18 14:59:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-hardware-detection.new/yast2-hardware-detection.changes 2014-04-26 11:45:00.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 16 11:31:23 CEST 2014 - snwint(a)suse.de + +- update hardware agent to use the latest libhd flags (bnc #841170) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-hardware-detection-3.1.1.tar.bz2 New: ---- yast2-hardware-detection-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-hardware-detection.spec ++++++ --- /var/tmp/diff_new_pack.Ep8Mdf/_old 2014-04-26 11:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Ep8Mdf/_new 2014-04-26 11:45:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-hardware-detection # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-hardware-detection -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,7 +27,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool # needed for all yast packages -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # autodocs BuildRequires: doxygen # testsuite ++++++ yast2-hardware-detection-3.1.1.tar.bz2 -> yast2-hardware-detection-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/VERSION new/yast2-hardware-detection-3.1.2/VERSION --- old/yast2-hardware-detection-3.1.1/VERSION 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/agent/HwParse.cc new/yast2-hardware-detection-3.1.2/agent/HwParse.cc --- old/yast2-hardware-detection-3.1.1/agent/HwParse.cc 2013-11-04 16:09:53.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/agent/HwParse.cc 2014-04-16 11:48:36.000000000 +0200 @@ -710,6 +710,31 @@ out->add (YCPString ("hotpluggable"), YCPBoolean (true)); } + if (hd->is.dualport) + { + out->add (YCPString ("dualport"), YCPBoolean (true)); + } + + if (hd->is.fcoe) + { + out->add (YCPString ("fcoe"), YCPBoolean (true)); + } + + if (hd->is.fcoe_offload) + { + out->add (YCPString ("fcoeoffload"), YCPBoolean (true)); + } + + if (hd->is.iscsi_offload) + { + out->add (YCPString ("iscsioffload"), YCPBoolean (true)); + } + + if (hd->is.storage_only) + { + out->add (YCPString ("storageonly"), YCPBoolean (true)); + } + // hd detail if (hd->detail) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.changes new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.changes --- old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.changes 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.changes 2014-04-16 11:48:36.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 16 11:31:23 CEST 2014 - snwint(a)suse.de + +- update hardware agent to use the latest libhd flags (bnc #841170) +- 3.1.2 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger(a)suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.spec new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.spec --- old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.spec 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.spec 2014-04-16 11:48:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-hardware-detection -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool # needed for all yast packages -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # autodocs BuildRequires: doxygen # testsuite -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dracut for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-04-26 11:44:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-04-12 21:33:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-04-26 11:44:58.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Apr 16 09:56:31 CEST 2014 - hare(a)suse.de + +- Enable multipath correctly during booting (bnc#873686) + Add: 0022-90multipath-Fixup-service-file-for-booting.patch + +------------------------------------------------------------------- +Mon Apr 14 14:19:49 UTC 2014 - pwieczorkiewicz(a)suse.com + +- fix-iscsi-firmware.patch: + Fix according to dracut-037 updates (iscsistarted-iscsi:). + +------------------------------------------------------------------- +Mon Apr 14 09:00:26 UTC 2014 - pwieczorkiewicz(a)suse.com + +- add_dracuts_network_params_for_iscsi.patch: + Add missing dracut's cmdline parameters to make network mandatory + and boot using iBFT when present. Without them iBFT booting does + not work. + +------------------------------------------------------------------- New: ---- 0022-90multipath-Fixup-service-file-for-booting.patch add_dracuts_network_params_for_iscsi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200 @@ -57,6 +57,8 @@ Patch31: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch Patch32: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch Patch33: 0021-90multipath-install-correct-multipath-rules.patch +Patch34: add_dracuts_network_params_for_iscsi.patch +Patch35: 0022-90multipath-Fixup-service-file-for-booting.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -118,6 +120,8 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 %build %configure\ ++++++ 0022-90multipath-Fixup-service-file-for-booting.patch ++++++ >From 10eda256afc1f1de0bffa26afdbdcf04394aeeeb Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Wed, 16 Apr 2014 09:35:28 +0200 Subject: 90multipath: Fixup service file for booting 'Type=forking' caused systemd to immediately terminate the entire process, and not creating any device maps. So we should be using 'Type=simple' here. References: bnc#873686 Signed-off-by: Hannes Reinecke <hare(a)suse.de> --- modules.d/90multipath/module-setup.sh | 4 ++-- modules.d/90multipath/multipathd.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh index 508241e..0149df9 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh @@ -92,8 +92,8 @@ install() { if dracut_module_included "systemd"; then inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service" - mkdir -p "${initdir}${systemdsystemconfdir}/sysinit.target.wants" - ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemconfdir}/sysinit.target.wants/multipathd.service" + mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants" + ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemunitdir}/sysinit.target.wants/multipathd.service" else inst_hook pre-trigger 02 "$moddir/multipathd.sh" inst_hook cleanup 02 "$moddir/multipathd-stop.sh" diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service index 01e497c..50a0883 100644 --- a/modules.d/90multipath/multipathd.service +++ b/modules.d/90multipath/multipathd.service @@ -5,9 +5,9 @@ DefaultDependencies=no Conflicts=shutdown.target [Service] -Type=forking +Type=simple ExecStartPre=/sbin/modprobe dm-multipath -ExecStart=/sbin/multipathd +ExecStart=/sbin/multipathd -s -d ExecReload=/sbin/multipathd reconfigure ExecStop=/sbin/multipathd shutdown -- 1.8.1.4 ++++++ add_dracuts_network_params_for_iscsi.patch ++++++ Index: dracut-037/modules.d/95iscsi/module-setup.sh =================================================================== --- dracut-037.orig/modules.d/95iscsi/module-setup.sh 2014-03-19 17:16:08.000000000 +0100 +++ dracut-037/modules.d/95iscsi/module-setup.sh 2014-04-14 13:40:02.560200357 +0200 @@ -39,6 +39,22 @@ depends() { installkernel() { local _arch=$(uname -m) + install_ibft() { + local IBFT_NICS="ethernet" + local IBFT_ROOT="/sys/firmware/ibft" + + # When iBFT is detected: + # - mark network as mandatory + # - specify firmware booting cmdline parameter + if [ -d "${IBFT_ROOT}/${IBFT_NICS}"* ]; then + echo "rd.neednet=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" + echo "rd.iscsi.firmware=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" + fi + } + + # Detect iBFT and perform mandatory steps + install_ibft + instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs iscsi_module_filter() { ++++++ fix-iscsi-firmware.patch ++++++ --- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200 @@ -8,16 +8,12 @@ modules.d/95iscsi/parse-iscsiroot.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 4be9d56..ec7764e 100755 ---- a/modules.d/95iscsi/parse-iscsiroot.sh -+++ b/modules.d/95iscsi/parse-iscsiroot.sh -@@ -61,10 +61,9 @@ fi - - # iscsi_firmware does not need argument checking - if [ -n "$iscsi_firmware" ] ; then -- netroot=${netroot:-iscsi:} -+ netroot=${netroot:-iscsi} +Index: dracut-037/modules.d/95iscsi/parse-iscsiroot.sh +=================================================================== +--- dracut-037.orig/modules.d/95iscsi/parse-iscsiroot.sh 2014-03-19 17:16:08.000000000 +0100 ++++ dracut-037/modules.d/95iscsi/parse-iscsiroot.sh 2014-04-15 11:49:40.922075002 +0200 +@@ -64,7 +64,6 @@ if [ -n "$iscsi_firmware" ] ; then + netroot=${netroot:-iscsi:} modprobe -q iscsi_boot_sysfs 2>/dev/null modprobe -q iscsi_ibft - initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'" @@ -33,6 +29,3 @@ fi fi --- -1.8.1.4 - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2014-04-26 11:44:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2014-04-12 22:03:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2014-04-26 11:44:56.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 15 08:36:46 UTC 2014 - tchvatal(a)suse.com + +- Fix sorting of RC kernels to be older than first regular of the + series. Fixes bnc#827531. + +- added patches: + * grub2-use-rpmsort-for-version-sorting.patch + +------------------------------------------------------------------- New: ---- grub2-use-rpmsort-for-version-sorting.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.D2OAl1/_old 2014-04-26 11:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.D2OAl1/_new 2014-04-26 11:44:58.000000000 +0200 @@ -139,6 +139,7 @@ Patch36: 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch Patch38: grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch +Patch39: grub2-use-rpmsort-for-version-sorting.patch # Btrfs snapshot booting related patches Patch101: 0002-btrfs-add-ability-to-boot-from-subvolumes.patch Patch102: 0003-cmdline-add-envvar-loader_cmdline_append.patch @@ -329,6 +330,7 @@ %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 ++++++ grub2-use-rpmsort-for-version-sorting.patch ++++++ diff -urN grub-2.02~beta2.old/util/grub-mkconfig_lib.in grub-2.02~beta2/util/grub-mkconfig_lib.in --- grub-2.02~beta2.old/util/grub-mkconfig_lib.in 2014-04-11 15:20:42.451394845 +0200 +++ grub-2.02~beta2/util/grub-mkconfig_lib.in 2014-04-11 15:58:02.940618803 +0200 @@ -229,7 +229,7 @@ version_test_numeric_a="$version_test_numeric_b" version_test_numeric_b="$version_test_numeric_c" fi - if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then + if [ "`printf '%s\n' "$version_test_gt_a" "$version_test_gt_b" | /usr/lib/rpm/rpmsort -r | head -n1`" = "$version_test_gt_a" ] ; then return 0 else return 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0