From d1bf53685ed1c8ca9d26f223659910ad25a51c74 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 9 Sep 2015 15:39:07 +0200 Subject: [PATCH 1/5] make default distributor empty (bnc#942519) --- src/lib/bootloader/grub2base.rb | 8 +------- src/lib/bootloader/proposal_client.rb | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/lib/bootloader/grub2base.rb b/src/lib/bootloader/grub2base.rb index babb13525..1b24eee44 100644 --- a/src/lib/bootloader/grub2base.rb +++ b/src/lib/bootloader/grub2base.rb @@ -123,13 +123,7 @@ def Propose BootCommon.globals["append"] ||= BootArch.DefaultKernelParams(resume) BootCommon.globals["failsafe_disabled"] = "true" if BootCommon.globals["failsafe_disabled"].nil? - # long name doesn't fit 800x600 GRUB screens, using short name by default - # (bnc#873675) - BootCommon.globals["distributor"] ||= Product.short_name - if !BootCommon.globals["distributor"] || - BootCommon.globals["distributor"].empty? - BootCommon.globals["distributor"] = Product.name - end + BootCommon.globals["distributor"] ||= "" # Propose bootloader serial settings from kernel cmdline during install (bnc#862388) serial = BootCommon.GetSerialFromAppend diff --git a/src/lib/bootloader/proposal_client.rb b/src/lib/bootloader/proposal_client.rb index c3c4ab47b..456509f61 100644 --- a/src/lib/bootloader/proposal_client.rb +++ b/src/lib/bootloader/proposal_client.rb @@ -129,10 +129,6 @@ def propose_for_update(force_reset) ) Yast::Bootloader.blRead(true, true) Yast::BootCommon.was_read = true - # update the product name - prod = Yast::Product.short_name - Yast::BootCommon.globals["distributor"] = prod - log.info "grub2 menu entry = #{prod}" end elsif old_bootloader == "none" log.info "Bootloader not configured, do not repropose" From d9e4f8e598c069c35b13084e1289be33a482ce27 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 10 Sep 2015 09:11:08 +0200 Subject: [PATCH 2/5] remove distributor entry from ui --- src/include/bootloader/grub2/dialogs.rb | 3 +-- src/include/bootloader/grub2/helps.rb | 4 ---- src/include/bootloader/grub2/options.rb | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/include/bootloader/grub2/dialogs.rb b/src/include/bootloader/grub2/dialogs.rb index 52654753b..8ca37912a 100644 --- a/src/include/bootloader/grub2/dialogs.rb +++ b/src/include/bootloader/grub2/dialogs.rb @@ -46,7 +46,7 @@ def boot_code_tab legacy_intel = (Arch.x86_64 || Arch.i386) && lt != "grub2-efi" pmbr_available = lt == "grub2-efi" || (legacy_intel && gpt_boot_disk?) - widget_names = ["distributor", "loader_type", "loader_location"] + widget_names = ["loader_type", "loader_location"] widget_names << "activate" << "generic_mbr" if legacy_intel widget_names << "inst_details" if legacy_intel || Arch.ppc widget_names << "pmbr" if pmbr_available @@ -64,7 +64,6 @@ def boot_code_tab Arch.s390 || Arch.aarch64 ? Empty() : "loader_location" ) ), - MarginBox(1, 0.5, "distributor"), MarginBox(1, 0.5, Left("activate")), MarginBox(1, 0.5, Left("generic_mbr")), MarginBox(1, 0.5, Left("pmbr")), diff --git a/src/include/bootloader/grub2/helps.rb b/src/include/bootloader/grub2/helps.rb index f152dad5b..08a5481e1 100644 --- a/src/include/bootloader/grub2/helps.rb +++ b/src/include/bootloader/grub2/helps.rb @@ -32,14 +32,10 @@ def initialize_bootloader_grub2_helps(_include_target) "pmbr" => _( "

Protective MBR flag is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.

" ), - "distribution" => _( - "

Distributor specifies name of distributor of kernel used to create boot entry name.

" - ) } @grub2_descriptions = { "append" => _("O&ptional Kernel Command Line Parameter"), - "distributor" => _("D&istributor"), "vgamode" => _("&Vga Mode"), "os_prober" => _("Probe Foreign OS"), "pmbr" => _("Protective MBR flag") diff --git a/src/include/bootloader/grub2/options.rb b/src/include/bootloader/grub2/options.rb index 7bce1242e..d3628bf3e 100644 --- a/src/include/bootloader/grub2/options.rb +++ b/src/include/bootloader/grub2/options.rb @@ -339,10 +339,6 @@ def grub2_pwd_init(_widget) def Grub2Options grub2_specific = { - "distributor" => CommonInputFieldWidget( - Ops.get(@grub2_descriptions, "distributor", "Distributor"), - Ops.get(@grub2_help_messages, "distributor", "") - ), "activate" => CommonCheckboxWidget( Ops.get(@grub_descriptions, "activate", "activate"), Ops.get(@grub_help_messages, "activate", "") From d9a3467c8c4a6655d30e39f218f050dcc1fca286 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 10 Sep 2015 09:19:30 +0200 Subject: [PATCH 3/5] changes --- package/yast2-bootloader.changes | 9 +++++++++ package/yast2-bootloader.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index cf9bdb315..740a8fb0c 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 10 07:11:25 UTC 2015 - jreidinger@suse.com + +- make default distributor value empty to use default one in grub2 + (bnc#942519) +- remove distributor entry from ui. Support only changes in text + file +- 3.1.147 + ------------------------------------------------------------------- Fri Sep 4 15:17:27 CEST 2015 - snwint@suse.de diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec index 504201fb1..93a137a6a 100644 --- a/package/yast2-bootloader.spec +++ b/package/yast2-bootloader.spec @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.146 +Version: 3.1.147 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build From 940c2ee6723657b686dd16e55f51448f3ce7479a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 10 Sep 2015 09:23:13 +0200 Subject: [PATCH 4/5] fix tests and make rubocop happy --- src/include/bootloader/grub2/helps.rb | 18 +++++++++--------- test/bootloader_proposal_client_test.rb | 1 - test/grub2pwd_test.rb | 2 +- test/udev_mapping_test.rb | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/include/bootloader/grub2/helps.rb b/src/include/bootloader/grub2/helps.rb index 08a5481e1..7381fba63 100644 --- a/src/include/bootloader/grub2/helps.rb +++ b/src/include/bootloader/grub2/helps.rb @@ -20,25 +20,25 @@ def initialize_bootloader_grub2_helps(_include_target) textdomain "bootloader" @grub2_help_messages = { - "append" => _( + "append" => _( "

Optional Kernel Command Line Parameter lets you define additional parameters to pass to the kernel.

" ), - "vgamode" => _( + "vgamode" => _( "

Vga Mode defines the VGA mode the kernel should set the console to when booting.

" ), - "os_prober" => _( + "os_prober" => _( "

Probe Foreign OS by means of os-prober for multiboot with other foreign distribution

" ), - "pmbr" => _( + "pmbr" => _( "

Protective MBR flag is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.

" - ), + ) } @grub2_descriptions = { - "append" => _("O&ptional Kernel Command Line Parameter"), - "vgamode" => _("&Vga Mode"), - "os_prober" => _("Probe Foreign OS"), - "pmbr" => _("Protective MBR flag") + "append" => _("O&ptional Kernel Command Line Parameter"), + "vgamode" => _("&Vga Mode"), + "os_prober" => _("Probe Foreign OS"), + "pmbr" => _("Protective MBR flag") } end end diff --git a/test/bootloader_proposal_client_test.rb b/test/bootloader_proposal_client_test.rb index 3cf6a69b9..cdef7ec24 100644 --- a/test/bootloader_proposal_client_test.rb +++ b/test/bootloader_proposal_client_test.rb @@ -174,7 +174,6 @@ expect(Yast::Bootloader).to_not receive(:Propose) expect(Yast::Bootloader).to receive(:blRead) - expect(Yast::Product).to receive(:short_name).and_return("SLES") subject.make_proposal({}) end diff --git a/test/grub2pwd_test.rb b/test/grub2pwd_test.rb index ab80b1638..a928a2850 100644 --- a/test/grub2pwd_test.rb +++ b/test/grub2pwd_test.rb @@ -200,7 +200,7 @@ def mock_file_presence(exists) config = described_class.new config.used = true - expect { config.write }.to raise_error + expect { config.write }.to raise_error(RuntimeError) end end end diff --git a/test/udev_mapping_test.rb b/test/udev_mapping_test.rb index d5227405e..a15ef3692 100644 --- a/test/udev_mapping_test.rb +++ b/test/udev_mapping_test.rb @@ -26,7 +26,7 @@ end it "raise exception if udev link is not known" do - expect { subject.to_kernel_device("/dev/disk/by-id/non-existing-device") }.to raise_error + expect { subject.to_kernel_device("/dev/disk/by-id/non-existing-device") }.to raise_error(RuntimeError) end end @@ -90,7 +90,7 @@ target_map_stub("storage_lvm.yaml") allow(Yast::Storage).to receive(:GetDefaultMountBy).and_return(:uuid) - expect { subject.to_mountby_device("/dev/vda50") }.to raise_error + expect { subject.to_mountby_device("/dev/vda50") }.to raise_error(RuntimeError) end end end From c519535d236bfb233f2c78bb933f1af00950591b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 15 Sep 2015 14:52:37 +0200 Subject: [PATCH 5/5] fix mess from merge --- package/yast2-bootloader.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 1b70d9a17..99d0af938 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -27,7 +27,6 @@ Thu Sep 10 14:45:51 CEST 2015 - schubi@suse.de - AutoYaST configuration: Initialize libstorage and do not regard the installed system. (bnc#942360) ->>>>>>> origin/master - 3.1.147 -------------------------------------------------------------------