This commit is contained in:
parent
20bd93757e
commit
1f9315f998
@ -84,7 +84,7 @@ function add_entry()
|
||||
--default \
|
||||
--add \
|
||||
--force $opt_xen_kernel \
|
||||
--name "Kernel-$release"
|
||||
--name "$release"
|
||||
|
||||
# Run the bootloader (e.g., lilo).
|
||||
update_bootloader --refresh
|
||||
@ -96,7 +96,7 @@ function add_entry()
|
||||
--initrd /boot/$initrd \
|
||||
--add \
|
||||
--force \
|
||||
--name "Kernel-$release"
|
||||
--name "$release"
|
||||
|
||||
# Run the bootloader (e.g., lilo).
|
||||
update_bootloader --refresh
|
||||
@ -109,7 +109,7 @@ function add_entry()
|
||||
--default \
|
||||
--add \
|
||||
--force \
|
||||
--name "Kernel-$release"
|
||||
--name "$release"
|
||||
|
||||
# Run the bootloader (e.g., lilo).
|
||||
update_bootloader --refresh
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6eb7a6f1ff7683be3071011c2011bbf742b42797e3477a8ea7801610e3cf327e
|
||||
size 44233
|
3
perl-Bootloader-0.4.15.tar.bz2
Normal file
3
perl-Bootloader-0.4.15.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:532ae7ae9a584e39d8384e01a17a5d95d476943d8c7b359e25e036409ae62a37
|
||||
size 45380
|
@ -1,3 +1,38 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 25 19:11:25 CEST 2007 - aosthof@suse.de
|
||||
|
||||
- Fixed usage of md raids for ia64 (#233255)
|
||||
- Reverted EFI Bootloader Label code in ELILO.pm to display gui
|
||||
wigets in YaST as they used to be displayed (#242985)
|
||||
- Version bump to 0.4.15
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 25 19:09:18 CEST 2007 - aosthof@suse.de
|
||||
|
||||
- Fixed naming scheme of product name for boot menu entries, so
|
||||
that Xen or Failsafe entries for instance get displayed correctly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 25 19:07:47 CEST 2007 - aosthof@suse.de
|
||||
|
||||
- Fix for booting from extended partitions (#246161, #259050)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 25 13:32:01 CEST 2007 - jplack@suse.de
|
||||
|
||||
- do section type checking cleanly for ZIPL (#261551)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 19 11:16:43 CEST 2007 - sf@suse.de
|
||||
|
||||
- use underlying device instead of md RAID-device (Bug #265867)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 12 18:08:58 CEST 2007 - aosthof@suse.de
|
||||
|
||||
- Fixed error handling for "dmsetup" calls in DMRaidAvailable(),
|
||||
IsDMDevice() and IsDMRaidSlave() in Tools.pm
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 11 18:36:37 CEST 2007 - aosthof@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package perl-Bootloader (Version 0.4.14)
|
||||
# spec file for package perl-Bootloader (Version 0.4.15)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -11,8 +11,8 @@
|
||||
# norootforbuild
|
||||
|
||||
Name: perl-Bootloader
|
||||
Version: 0.4.14
|
||||
Release: 3
|
||||
Version: 0.4.15
|
||||
Release: 1
|
||||
Requires: perl >= %{perl_version}
|
||||
Requires: perl-gettext
|
||||
Requires: mdadm e2fsprogs
|
||||
@ -63,6 +63,23 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
|
||||
/usr/lib/bootloader
|
||||
|
||||
%changelog
|
||||
* Wed Apr 25 2007 - aosthof@suse.de
|
||||
- Fixed usage of md raids for ia64 (#233255)
|
||||
- Reverted EFI Bootloader Label code in ELILO.pm to display gui
|
||||
wigets in YaST as they used to be displayed (#242985)
|
||||
- Version bump to 0.4.15
|
||||
* Wed Apr 25 2007 - aosthof@suse.de
|
||||
- Fixed naming scheme of product name for boot menu entries, so
|
||||
that Xen or Failsafe entries for instance get displayed correctly
|
||||
* Wed Apr 25 2007 - aosthof@suse.de
|
||||
- Fix for booting from extended partitions (#246161, #259050)
|
||||
* Wed Apr 25 2007 - jplack@suse.de
|
||||
- do section type checking cleanly for ZIPL (#261551)
|
||||
* Thu Apr 19 2007 - sf@suse.de
|
||||
- use underlying device instead of md RAID-device (Bug #265867)
|
||||
* Thu Apr 12 2007 - aosthof@suse.de
|
||||
- Fixed error handling for "dmsetup" calls in DMRaidAvailable(),
|
||||
IsDMDevice() and IsDMRaidSlave() in Tools.pm
|
||||
* Wed Apr 11 2007 - aosthof@suse.de
|
||||
- Corrected resolution of symlinks in Tools.pm (#244033)
|
||||
* Wed Apr 11 2007 - aosthof@suse.de
|
||||
|
@ -108,22 +108,38 @@ Bootloader::Tools perl module.
|
||||
|
||||
sub GetProduct {
|
||||
my $namever;
|
||||
|
||||
# First try: Does yast work these days?
|
||||
$namever = `yast2 print-product 2>&1`;
|
||||
chomp $namever;
|
||||
|
||||
# first try: new zypp-query-pool adopted to our needs
|
||||
my @product_query = split ('\|', qx{/usr/lib/zypp/zypp-query-pool products \@system});
|
||||
my $found = 0;
|
||||
my $i = 0;
|
||||
|
||||
for ($i = 0; $i <= @product_query; $i++){
|
||||
if ($product_query[$i] eq "base"){
|
||||
$found = 1;
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
||||
# Determine the bootloader type, because long product names may only
|
||||
# be used in case of grub
|
||||
my $loader = Bootloader::Tools::GetBootloader();
|
||||
|
||||
# Substitude whitespaces with an underscore
|
||||
if ($loader ne "grub") {
|
||||
$namever =~ s/\s/_/;
|
||||
if ($found){
|
||||
if ($loader ne "grub") {
|
||||
$namever = $product_query[$i+1];
|
||||
$namever =~ s/\s/_/;
|
||||
}
|
||||
else{
|
||||
$namever = $product_query[$i+2];
|
||||
}
|
||||
chomp $namever;
|
||||
}
|
||||
return "$namever" if $namever ne '' and $namever !~ /\n/;
|
||||
|
||||
# Second try: Is there a usable /etc/SuSE-release?
|
||||
# This should really not be used anymore, as the syntax changed
|
||||
# no 'SP1' in the output.
|
||||
if (open(RELEASE, "</etc/SuSE-release") && $loader eq "grub") {
|
||||
# first line is sufficient
|
||||
$namever = <RELEASE>;
|
||||
@ -253,8 +269,8 @@ if (defined $oper{add}) {
|
||||
|
||||
if ($loader eq "grub") {
|
||||
$opt_name =~ s/-[^-]*$//;
|
||||
$opt_failsafe = "Failsafe -- " . $opt_name;
|
||||
$opt_name = GetProduct() . " -- " . $opt_name;
|
||||
$opt_failsafe = "Failsafe -- " . GetProduct() . " - " . $opt_name;
|
||||
$opt_name = GetProduct() . " - " . $opt_name;
|
||||
}
|
||||
else {
|
||||
$opt_failsafe = "Failsafe";
|
||||
@ -265,10 +281,10 @@ if (defined $oper{add}) {
|
||||
elsif ($opt_xen) {
|
||||
if ($loader eq "grub") {
|
||||
$opt_name =~ s/-xen.*$//;
|
||||
$opt_xen_name = "Xen -- " . GetProduct() . " - " . $opt_name;
|
||||
$opt_xen_name = "XEN -- " . GetProduct() . " - " . $opt_name;
|
||||
}
|
||||
else {
|
||||
$opt_name = "Xen";
|
||||
$opt_name = "XEN";
|
||||
}
|
||||
}
|
||||
# Naming scheme for all other kernels
|
||||
@ -277,7 +293,7 @@ if (defined $oper{add}) {
|
||||
$opt_name = GetProduct() if $add_product;
|
||||
}
|
||||
else {
|
||||
$opt_name .= " -- " . GetProduct() if $add_product;
|
||||
$opt_name = GetProduct() . " -- " . $opt_name if $add_product;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user