OBS User unknown 2007-12-06 00:20:15 +00:00 committed by Git OBS Bridge
parent f0751af21a
commit c3e53ef916
6 changed files with 24 additions and 7 deletions

View File

@ -231,7 +231,7 @@ function remove_entry()
# thus do not match either. (#223030) # thus do not match either. (#223030)
if [ "$flavor" == "xen" ]; then if [[ "$flavor" =~ xen ]]; then
update_bootloader --image /boot/$image \ update_bootloader --image /boot/$image \
--initrd /boot/$initrd \ --initrd /boot/$initrd \
--xen \ --xen \

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 5 14:53:20 CET 2007 - aosthof@suse.de
- Fixed removal of xen (-pae) entries (#345188)
- Version bump to 0.4.39
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 30 10:19:02 CET 2007 - aosthof@suse.de Fri Nov 30 10:19:02 CET 2007 - aosthof@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package perl-Bootloader (Version 0.4.38) # spec file for package perl-Bootloader (Version 0.4.39)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -11,7 +11,7 @@
# norootforbuild # norootforbuild
Name: perl-Bootloader Name: perl-Bootloader
Version: 0.4.38 Version: 0.4.39
Release: 1 Release: 1
Requires: perl >= %{perl_version} Requires: perl >= %{perl_version}
Requires: perl-gettext Requires: perl-gettext
@ -66,6 +66,9 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
/usr/lib/bootloader /usr/lib/bootloader
%changelog %changelog
* Wed Dec 05 2007 - aosthof@suse.de
- Fixed removal of xen (-pae) entries (#345188)
- Version bump to 0.4.39
* Fri Nov 30 2007 - aosthof@suse.de * Fri Nov 30 2007 - aosthof@suse.de
- Prevent changing root device in kernel append line (#344447) - Prevent changing root device in kernel append line (#344447)
- Version bump to 0.4.38 - Version bump to 0.4.38

View File

@ -205,7 +205,15 @@ if ($opt_initrd and $opt_initrd !~ m;^/;) {
if (defined $opt_xen_kernel) { if (defined $opt_xen_kernel) {
$opt_xen = 1; $opt_xen = 1;
} elsif ($opt_xen) { } elsif ($opt_xen) {
$opt_xen_kernel = "/boot/xen.gz"; my $xen_flavor = $opt_image;
$xen_flavor =~ s/.*-(\w+)/\1/;
if ($xen_flavor eq "xenpae") {
$opt_xen_kernel = "/boot/xen-pae.gz";
}
else {
$opt_xen_kernel = "/boot/xen.gz";
}
} }
my $type = $opt_xen ? "xen" : "image"; my $type = $opt_xen ? "xen" : "image";