Josef Reidinger 2010-04-09 09:13:14 +00:00 committed by Git OBS Bridge
parent d4d0820edc
commit 436d2e6f7d
5 changed files with 22 additions and 9 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abca5b38199130e24d98077c5668ca5069effcab61a1acdaec05d84697c45142
size 52339

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a547cb8807a3ff3bcf728d906ed8c09dd4ba2dc92d6e95346e6f2331aad1c463
size 52467

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Apr 9 09:08:34 UTC 2010 - jreidinger@novell.com
- use same root as it is in etc/fstab (bnc#575362)
- use new zypper method to get boot label (prevent hang during
installation)
- 0.5.10
-------------------------------------------------------------------
Wed Mar 31 08:21:21 UTC 2010 - jreidinger@novell.com
- don't allow empty custom boot for GRUB (bnc#589433)
-------------------------------------------------------------------
Fri Feb 26 14:01:47 UTC 2010 - jreidinger@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package perl-Bootloader (Version 0.5.9)
# spec file for package perl-Bootloader (Version 0.5.10)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,8 +19,8 @@
Name: perl-Bootloader
Version: 0.5.9
Release: 1
Version: 0.5.10
Release: 0
Requires: perl-base = %{perl_version}
Requires: e2fsprogs
Recommends: perl-gettext

View File

@ -120,9 +120,9 @@ sub GetProduct {
# first try: use zypper
if ( -f '/usr/bin/zypper' ){
my $zypper_xml = qx{ZYPP_READONLY_HACK=1 zypper -qx --no-refresh pd -i | grep 'isbase="1"'};
if ($zypper_xml =~ m/^.*summary="([^"]*)".*shortname="([^"]*)".*$/){
return $1 if ($1 ne ""); #FIXME add here exceptions if bootloader has problems with long names
my $zypper_out = qx{zypper --terse tos -l};
if ($zypper_out =~ m/^labelLong\s*(\S.*\S)\s*\nlabelShort\s*(\S.*\S)[\s\n]*$/){
return $1 if ($1 ne "" && $loader eq "grub");
return $2 if ($2 ne "");
}
}