commit 82f5e825982cbce2d5276a9c58f3e8016872992c
Author: Elan Ruusamäe <[email protected]>
Date: Sat Jul 13 14:16:54 2013 +0300
update grub2 paths for pld
grub2.patch | 4 ++--
pm-utils.spec | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/pm-utils.spec b/pm-utils.spec
index a586636..eaef95d 100644
--- a/pm-utils.spec
+++ b/pm-utils.spec
@@ -35,6 +35,8 @@ Requires: kbd
Requires: mount
# sleep.d/90clock
Requires: util-linux
+# sleep.d/01grub and power.d/wireless
+Requires: which
# sleep.d/55NetworkManager
Suggests: dbus
# sleep.d/99video
diff --git a/grub2.patch b/grub2.patch
index 61269be..b04dd9e 100644
--- a/grub2.patch
+++ b/grub2.patch
@@ -17,7 +17,7 @@ diff -up pm-utils-1.4.1/pm/sleep.d/01grub.orig
pm-utils-1.4.1/pm/sleep.d/01grub
esac
- [ -x /sbin/grubby -a -x /sbin/grub ] || return $NA
-+ [ -x /sbin/grubby -a \( -x /sbin/grub -o -r /etc/grub2.cfg \) ] || \
++ [ -x /sbin/grubby -a \( -x /sbin/grub -o -r /boot/grub/grub.cfg \) ] ||
\
+ return $NA
[ -e "/boot/vmlinuz-$(uname -r)" ] || return 1
- out=$(/sbin/grubby --info /boot/vmlinuz-$(uname -r) |grep index)
@@ -28,7 +28,7 @@ diff -up pm-utils-1.4.1/pm/sleep.d/01grub.orig
pm-utils-1.4.1/pm/sleep.d/01grub
- echo "savedefault --default=${current} --once" | \
- /sbin/grub --device-map=/boot/grub/device.map \
- --batch --no-floppy --no-curses >/dev/null
-+ if [ -r /etc/grub2.cfg ]; then
++ if [ -r /boot/grub/grub.cfg ]; then
+ # to enable this functionality in grub2
+ # GRUB_DEFAULT=saved is needed in /etc/default/grub
+ # if you want to be able to by-pass the selection in the
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pm-utils.git/commitdiff/a47e60f6e5b3b2904474ea037f9d340ee5684b01
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
