OBS User unknown 2008-09-24 15:22:31 +00:00 committed by Git OBS Bridge
parent c7716951ca
commit d9a6893f34
6 changed files with 45 additions and 15 deletions

View File

@ -301,6 +301,11 @@ if [ -e $device_map ] ; then
fi
) >> $logname
if [ `grep -c "^[^[:space:]]\+[[:space:]]\+/boot" /etc/fstab` -ne `grep -c "^[^[:space:]]\+[[:space:]]\+/boot" /etc/mtab` ]; then
echo "/boot directory is not mounted";
exit 1;
fi
# File containing commands for later execution
delayed_exec_file="/boot/perl-BL_delayed_exec"

View File

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

View File

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

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Sep 19 15:46:10 CEST 2008 - jreidinger@suse.cz
- doesn't allow change between default and xen kernel during
install (bnc #397075)
- don't resolve user specified symlinks (bnc #410431)
- remove unnecesary spaces in append line (bnc #266223)
- always have default section in ELILO (bnc #250981)
- try mount /sys if doesn't contain files (bnc #151877)
- check if /boot is mounted during kernel update (bnc #340837)
- properly handle setkey option in GRUB (bnc #410004)
- move thinkpad mbr detection to perl-Bootloader from yast
(start moving some functionality from yast to perl-BL)
- 0.4.71
-------------------------------------------------------------------
Fri Sep 12 13:38:11 CEST 2008 - jreidinger@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package perl-Bootloader (Version 0.4.70)
# spec file for package perl-Bootloader (Version 0.4.71)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,7 +19,7 @@
Name: perl-Bootloader
Version: 0.4.70
Version: 0.4.71
Release: 1
Requires: perl-base = %{perl_version}
Requires: e2fsprogs
@ -74,6 +74,18 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
/usr/lib/bootloader
%changelog
* Fri Sep 19 2008 jreidinger@suse.cz
- doesn't allow change between default and xen kernel during
install (bnc #397075)
- don't resolve user specified symlinks (bnc #410431)
- remove unnecesary spaces in append line (bnc #266223)
- always have default section in ELILO (bnc #250981)
- try mount /sys if doesn't contain files (bnc #151877)
- check if /boot is mounted during kernel update (bnc #340837)
- properly handle setkey option in GRUB (bnc #410004)
- move thinkpad mbr detection to perl-Bootloader from yast
(start moving some functionality from yast to perl-BL)
- 0.4.71
* Fri Sep 12 2008 jreidinger@suse.cz
- gfxmenu menu is removed from trustedgrub global section
- if type of kernel is changed, then correctly transfer default

View File

@ -381,18 +381,10 @@ if (defined $oper{add}) {
pod2usage("There are already sections with image '$opt_image'");
}
} else {
my $default_image = GetDefaultImage();
# Check if default image is a symlink. If this is the case, let the new
# kernel be the default one.
if (-l $default_image) {
$default_image = readlink ($default_image);
push @params, default => $opt_default;
}
# Else, if option $opt_force_default is set, let this new kernel be
# If, if option $opt_force_default is set, let this new kernel be
# the default one.
elsif ($opt_force_default) {
if ($opt_force_default) {
push @params, default => $opt_default;
}
@ -400,6 +392,12 @@ if (defined $oper{add}) {
# flavor as the one of the new kernel, let the new kernel be the
# default one.
else {
my $default_image = GetDefaultImage();
if (-l $default_image) {
$default_image = readlink ($default_image);
}
$default_image =~ s/^.*-//;
if ($opt_image =~ m/.*-${default_image}$/) {