OBS User unknown 2008-08-02 04:20:48 +00:00 committed by Git OBS Bridge
parent 6f00e69032
commit 59efac0bb7
5 changed files with 40 additions and 18 deletions

View File

@ -118,7 +118,8 @@ function add_entry()
--force-default \
--add \
--force $opt_xen_kernel \
--name "$release"
--name "$release" \
|| exit 1
else
# Add the new bootloader entry (xen kernel)
update_bootloader --image /boot/$image \
@ -126,11 +127,12 @@ function add_entry()
--default \
--add \
--force $opt_xen_kernel \
--name "$release"
--name "$release" \
|| exit 1
fi
# Run the bootloader (e.g., lilo).
update_bootloader --refresh
update_bootloader --refresh || exit 1
;;
(debug)
@ -142,18 +144,20 @@ function add_entry()
--force-default \
--add \
--force \
--name "$release"
--name "$release" \
|| exit 1
else
# Add the new bootloader entry (debug kernel)
update_bootloader --image /boot/$image \
--initrd /boot/$initrd \
--add \
--force \
--name "$release"
--name "$release" \
|| exit 1
fi
# Run the bootloader (e.g., lilo).
update_bootloader --refresh
update_bootloader --refresh || exit 1
;;
(*)
@ -166,7 +170,8 @@ function add_entry()
--force-default \
--add \
--force \
--name "$release"
--name "$release" \
|| exit 1
else
# Add the new bootloader entry
update_bootloader --image /boot/$image \
@ -174,11 +179,12 @@ function add_entry()
--default \
--add \
--force \
--name "$release"
--name "$release" \
|| exit 1
fi
# Run the bootloader (e.g., lilo).
update_bootloader --refresh
update_bootloader --refresh || exit 1
;;
esac
fi
@ -241,16 +247,18 @@ function remove_entry()
--initrd /boot/$initrd \
--xen \
--remove \
--force
--force \
|| exit 1
else
update_bootloader --image /boot/$image \
--initrd /boot/$initrd \
--remove \
--force
--force \
|| exit 1
fi
# Run the bootloader (e.g., lilo).
update_bootloader --refresh
update_bootloader --refresh || exit 1
fi
fi
}
@ -281,7 +289,8 @@ if [ -e $fstab ] ; then
fi
echo "excerpts of /dev:"
ls -l /dev/{[hs]d[ab]?,md[0-3],.udev,disk/by-*} 2>/dev/null
#if doesn't find anything you can be on strange architecture (like ps3) and dump all block devices
ls -l /dev/{[hs]d[ab]?,md[0-3],.udev,disk/by-*} 2>/dev/null || ls -l /dev | grep ^b
echo
device_map="/boot/grub/device.map"

View File

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

View File

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 29 15:51:16 CEST 2008 - jsrain@suse.cz
- return unmodified GRUB device from GrubDev2UnixDev when match not
found in device map so that it is distinguishable GRUB device and
cannot be understood as UNIX device (bnc #411937)
- version bump to 0.4.66
-------------------------------------------------------------------
Tue Jul 22 10:29:14 CEST 2008 - jreidinger@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package perl-Bootloader (Version 0.4.65)
# spec file for package perl-Bootloader (Version 0.4.66)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -12,7 +12,7 @@
Name: perl-Bootloader
Version: 0.4.65
Version: 0.4.66
Release: 1
Requires: perl-base = %{perl_version}
Requires: e2fsprogs
@ -67,6 +67,11 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
/usr/lib/bootloader
%changelog
* Tue Jul 29 2008 jsrain@suse.cz
- return unmodified GRUB device from GrubDev2UnixDev when match not
found in device map so that it is distinguishable GRUB device and
cannot be understood as UNIX device (bnc #411937)
- version bump to 0.4.66
* Tue Jul 22 2008 jreidinger@suse.cz
- fix crash in update-bootloader (bnc #411161)
- don't try remove kernel image if none bootloader installed