This commit is contained in:
parent
6f00e69032
commit
59efac0bb7
@ -118,7 +118,8 @@ function add_entry()
|
|||||||
--force-default \
|
--force-default \
|
||||||
--add \
|
--add \
|
||||||
--force $opt_xen_kernel \
|
--force $opt_xen_kernel \
|
||||||
--name "$release"
|
--name "$release" \
|
||||||
|
|| exit 1
|
||||||
else
|
else
|
||||||
# Add the new bootloader entry (xen kernel)
|
# Add the new bootloader entry (xen kernel)
|
||||||
update_bootloader --image /boot/$image \
|
update_bootloader --image /boot/$image \
|
||||||
@ -126,11 +127,12 @@ function add_entry()
|
|||||||
--default \
|
--default \
|
||||||
--add \
|
--add \
|
||||||
--force $opt_xen_kernel \
|
--force $opt_xen_kernel \
|
||||||
--name "$release"
|
--name "$release" \
|
||||||
|
|| exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run the bootloader (e.g., lilo).
|
# Run the bootloader (e.g., lilo).
|
||||||
update_bootloader --refresh
|
update_bootloader --refresh || exit 1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(debug)
|
(debug)
|
||||||
@ -142,18 +144,20 @@ function add_entry()
|
|||||||
--force-default \
|
--force-default \
|
||||||
--add \
|
--add \
|
||||||
--force \
|
--force \
|
||||||
--name "$release"
|
--name "$release" \
|
||||||
|
|| exit 1
|
||||||
else
|
else
|
||||||
# Add the new bootloader entry (debug kernel)
|
# Add the new bootloader entry (debug kernel)
|
||||||
update_bootloader --image /boot/$image \
|
update_bootloader --image /boot/$image \
|
||||||
--initrd /boot/$initrd \
|
--initrd /boot/$initrd \
|
||||||
--add \
|
--add \
|
||||||
--force \
|
--force \
|
||||||
--name "$release"
|
--name "$release" \
|
||||||
|
|| exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run the bootloader (e.g., lilo).
|
# Run the bootloader (e.g., lilo).
|
||||||
update_bootloader --refresh
|
update_bootloader --refresh || exit 1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(*)
|
(*)
|
||||||
@ -166,7 +170,8 @@ function add_entry()
|
|||||||
--force-default \
|
--force-default \
|
||||||
--add \
|
--add \
|
||||||
--force \
|
--force \
|
||||||
--name "$release"
|
--name "$release" \
|
||||||
|
|| exit 1
|
||||||
else
|
else
|
||||||
# Add the new bootloader entry
|
# Add the new bootloader entry
|
||||||
update_bootloader --image /boot/$image \
|
update_bootloader --image /boot/$image \
|
||||||
@ -174,11 +179,12 @@ function add_entry()
|
|||||||
--default \
|
--default \
|
||||||
--add \
|
--add \
|
||||||
--force \
|
--force \
|
||||||
--name "$release"
|
--name "$release" \
|
||||||
|
|| exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run the bootloader (e.g., lilo).
|
# Run the bootloader (e.g., lilo).
|
||||||
update_bootloader --refresh
|
update_bootloader --refresh || exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
@ -241,16 +247,18 @@ function remove_entry()
|
|||||||
--initrd /boot/$initrd \
|
--initrd /boot/$initrd \
|
||||||
--xen \
|
--xen \
|
||||||
--remove \
|
--remove \
|
||||||
--force
|
--force \
|
||||||
|
|| exit 1
|
||||||
else
|
else
|
||||||
update_bootloader --image /boot/$image \
|
update_bootloader --image /boot/$image \
|
||||||
--initrd /boot/$initrd \
|
--initrd /boot/$initrd \
|
||||||
--remove \
|
--remove \
|
||||||
--force
|
--force \
|
||||||
|
|| exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run the bootloader (e.g., lilo).
|
# Run the bootloader (e.g., lilo).
|
||||||
update_bootloader --refresh
|
update_bootloader --refresh || exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -281,7 +289,8 @@ if [ -e $fstab ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "excerpts of /dev:"
|
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
|
echo
|
||||||
|
|
||||||
device_map="/boot/grub/device.map"
|
device_map="/boot/grub/device.map"
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cdb5c3d6e62ebc9050e595cdd2674bcd5731fcbf37705889a888c329112e76b4
|
|
||||||
size 51254
|
|
3
perl-Bootloader-0.4.66.tar.bz2
Normal file
3
perl-Bootloader-0.4.66.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1cb70a3d8ba46c23e603c12a4a5b4f7bb70c6f4391aa484578fefc72f152dfab
|
||||||
|
size 51609
|
@ -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
|
Tue Jul 22 10:29:14 CEST 2008 - jreidinger@suse.cz
|
||||||
|
|
||||||
|
@ -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.
|
# Copyright (c) 2008 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
|
||||||
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: perl-Bootloader
|
Name: perl-Bootloader
|
||||||
Version: 0.4.65
|
Version: 0.4.66
|
||||||
Release: 1
|
Release: 1
|
||||||
Requires: perl-base = %{perl_version}
|
Requires: perl-base = %{perl_version}
|
||||||
Requires: e2fsprogs
|
Requires: e2fsprogs
|
||||||
@ -67,6 +67,11 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
|
|||||||
/usr/lib/bootloader
|
/usr/lib/bootloader
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Jul 22 2008 jreidinger@suse.cz
|
||||||
- fix crash in update-bootloader (bnc #411161)
|
- fix crash in update-bootloader (bnc #411161)
|
||||||
- don't try remove kernel image if none bootloader installed
|
- don't try remove kernel image if none bootloader installed
|
||||||
|
Loading…
Reference in New Issue
Block a user