Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-bootloader -> sle12
## BNC# 873620 : "Build0269 does not boot" (RESOLVED/FIXED)
## BNC# 864370 : "If you use XFS root, system may not boot" (ASSIGNED/)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-bootloader/yast2-bootloader.changes 2014-04-10 17:22:50.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes 2014-04-15 13:47:07.000000000 +0200
@@ -1,0 +2,19 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-bootloader
- yast2-kdump
- yast2-product-creator
- yast2-reipl
- yast2-schema
- yast2-vm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-bootloader (Old)
and /mounts/work_src_done/SLE12/yast2-bootloader (BS:build ID:36350 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-bootloader-3.1.21.tar.bz2
New:
----
yast2-bootloader-3.1.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.D0LCYY/_old 2014-04-15 14:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.D0LCYY/_new 2014-04-15 14:44:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.21
+Version: 3.1.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-bootloader-3.1.21.tar.bz2 -> yast2-bootloader-3.1.24.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.24/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.21/package/yast2-bootloader.changes 2014-04-10 14:03:33.000000000 +0200
+++ new/yast2-bootloader-3.1.24/package/yast2-bootloader.changes 2014-04-15 13:43:25.000000000 +0200
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+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.24/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.21/package/yast2-bootloader.spec 2014-04-10 14:03:33.000000000 +0200
+++ new/yast2-bootloader-3.1.24/package/yast2-bootloader.spec 2014-04-15 13:43:25.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.21
+Version: 3.1.24
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.24/src/clients/bootloader_proposal.rb
--- old/yast2-bootloader-3.1.21/src/clients/bootloader_proposal.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/clients/bootloader_proposal.rb 2014-04-15 13:43:25.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.24/src/include/bootloader/grub/misc.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/misc.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/grub/misc.rb 2014-04-15 13:43:25.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.24/src/include/bootloader/grub/options.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/options.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/grub/options.rb 2014-04-15 13:43:25.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/misc.rb new/yast2-bootloader-3.1.24/src/include/bootloader/grub2/misc.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/misc.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/grub2/misc.rb 2014-04-15 13:43:25.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.24/src/include/bootloader/routines/i386.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/i386.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/routines/i386.rb 2014-04-15 13:43:25.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.24/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:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/routines/lib_iface.rb 2014-04-15 13:43:25.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.24/src/include/bootloader/routines/lilolike.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lilolike.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/routines/lilolike.rb 2014-04-15 13:43:25.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.24/src/include/bootloader/routines/misc.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/misc.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/routines/misc.rb 2014-04-15 13:43:25.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.24/src/include/bootloader/routines/popups.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/popups.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/routines/popups.rb 2014-04-15 13:43:25.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.24/src/include/bootloader/routines/wizards.rb
--- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/wizards.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/include/bootloader/routines/wizards.rb 2014-04-15 13:43:25.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.24/src/lib/bootloader/grub2base.rb
--- old/yast2-bootloader-3.1.21/src/lib/bootloader/grub2base.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/lib/bootloader/grub2base.rb 2014-04-15 13:43:25.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.24/src/modules/BootCommon.rb
--- old/yast2-bootloader-3.1.21/src/modules/BootCommon.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/modules/BootCommon.rb 2014-04-15 13:43:25.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
@@ -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.24/src/modules/BootGRUB.rb
--- old/yast2-bootloader-3.1.21/src/modules/BootGRUB.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/modules/BootGRUB.rb 2014-04-15 13:43:25.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/BootSupportCheck.rb new/yast2-bootloader-3.1.24/src/modules/BootSupportCheck.rb
--- old/yast2-bootloader-3.1.21/src/modules/BootSupportCheck.rb 2014-04-10 14:03:34.000000000 +0200
+++ new/yast2-bootloader-3.1.24/src/modules/BootSupportCheck.rb 2014-04-15 13:43:25.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
continue with "q"...
Checked in at Tue Apr 15 14:45:22 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org