|
 |
ef56e5 |
diff -up pm-utils-1.4.1/pm/sleep.d/01grub.orig pm-utils-1.4.1/pm/sleep.d/01grub
|
|
|
ef56e5 |
--- pm-utils-1.4.1/pm/sleep.d/01grub.orig 2010-07-04 16:42:51.000000000 +0200
|
|
|
ef56e5 |
+++ pm-utils-1.4.1/pm/sleep.d/01grub 2011-08-22 14:11:39.460613138 +0200
|
|
|
ef56e5 |
@@ -4,7 +4,8 @@
|
|
|
ef56e5 |
|
|
|
ef56e5 |
default_resume_kernel()
|
|
|
ef56e5 |
{
|
|
|
ef56e5 |
- [ "$1" = "suspend" ] && return $NA
|
|
|
ef56e5 |
+ local g2reboot
|
|
|
ef56e5 |
+ [ "$1" = "suspend" ] && return $NA
|
|
|
ef56e5 |
case $(uname -m) in
|
|
|
ef56e5 |
i?86|x86_64|athlon)
|
|
|
ef56e5 |
;;
|
|
|
ef56e5 |
@@ -13,14 +14,26 @@ default_resume_kernel()
|
|
|
ef56e5 |
;;
|
|
|
ef56e5 |
esac
|
|
|
ef56e5 |
|
|
|
ef56e5 |
- [ -x /sbin/grubby -a -x /sbin/grub ] || return $NA
|
|
|
ef56e5 |
+ [ -x /sbin/grubby -a \( -x /sbin/grub -o -r /etc/grub2.cfg \) ] || \
|
|
|
ef56e5 |
+ return $NA
|
|
|
ef56e5 |
[ -e "/boot/vmlinuz-$(uname -r)" ] || return 1
|
|
|
ef56e5 |
- out=$(/sbin/grubby --info /boot/vmlinuz-$(uname -r) |grep index)
|
|
|
ef56e5 |
+ out=$(/sbin/grubby --info /boot/vmlinuz-$(uname -r) |grep index | \
|
|
|
ef56e5 |
+ head -n 1)
|
|
|
ef56e5 |
[ -n "${out}" ] || return 1
|
|
|
ef56e5 |
current=${out#index=}
|
|
|
ef56e5 |
- echo "savedefault --default=${current} --once" | \
|
|
|
ef56e5 |
- /sbin/grub --device-map=/boot/grub/device.map \
|
|
|
ef56e5 |
- --batch --no-floppy --no-curses >/dev/null
|
|
|
ef56e5 |
+ if [ -r /etc/grub2.cfg ]; then
|
|
|
ef56e5 |
+ # to enable this functionality in grub2
|
|
|
ef56e5 |
+ # GRUB_DEFAULT=saved is needed in /etc/default/grub
|
|
|
ef56e5 |
+ # if you want to be able to by-pass the selection in the
|
|
|
ef56e5 |
+ # boot menu, also use GRUB_SAVEDEFAULT=true
|
|
|
ef56e5 |
+ g2reboot=`which grub2-reboot 2>/dev/null` || \
|
|
|
ef56e5 |
+ g2reboot=`which grub-reboot 2>/dev/null` || return $NA
|
|
|
ef56e5 |
+ $g2reboot ${current} > /dev/null
|
|
|
ef56e5 |
+ else
|
|
|
ef56e5 |
+ echo "savedefault --default=${current} --once" | \
|
|
|
ef56e5 |
+ /sbin/grub --device-map=/boot/grub/device.map \
|
|
|
ef56e5 |
+ --batch --no-floppy --no-curses >/dev/null
|
|
|
ef56e5 |
+ fi
|
|
|
ef56e5 |
|
|
|
ef56e5 |
return 0
|
|
|
ef56e5 |
}
|