diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | etc/conf.d/vdr.shutdown | 5 | ||||
| -rw-r--r-- | usr/share/vdr/shutdown/shutdown-reboot.sh | 21 |
3 files changed, 26 insertions, 4 deletions
@@ -1,6 +1,10 @@ # ChangeLog for gentoo-vdr-scripts # $Id$ + 07 Oct 2012; Joerg Bornkessel <hd_brummy@gentoo.org> etc/conf.d/vdr.shutdown, + usr/share/vdr/shutdown/shutdown-reboot.sh: + grub2 support added + 29 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdrplugin-rebuild/vdrplugin-rebuild: changed parameter for paludis, fix trigger for full systemupdate diff --git a/etc/conf.d/vdr.shutdown b/etc/conf.d/vdr.shutdown index 202ec68..c4fb6b0 100644 --- a/etc/conf.d/vdr.shutdown +++ b/etc/conf.d/vdr.shutdown @@ -97,10 +97,9 @@ # # Only used for WAKEUP_METHOD nvram when motherboard needs reboot -# allowed values: auto grub lilo +# allowed values: auto grub grub2 lilo # default: use auto - use a special startup-script, no need to play with boot-managers :) #BOOT_MANAGER="auto" -#BOOT_MANAGER="grub" # # Which entry in the boot manager configuration should nvram use to @@ -178,7 +177,7 @@ # # This should normally not changed. -# allowed values: grub-set-default savedefault +# allowed values: grub-set-default savedefault grub2-set-default # default: grub-set-default #GRUB_SET_REBOOT_ENTRY_METHOD="grub-set-default" diff --git a/usr/share/vdr/shutdown/shutdown-reboot.sh b/usr/share/vdr/shutdown/shutdown-reboot.sh index 9855096..27859d0 100644 --- a/usr/share/vdr/shutdown/shutdown-reboot.sh +++ b/usr/share/vdr/shutdown/shutdown-reboot.sh @@ -17,7 +17,7 @@ case "${BOOT_MANAGER}" in /etc/init.d/wakeup-reboot-halt mark_for_reboot ;; grub) - mount /boot + mount /boot if [ -n "${REBOOT_ENTRY_GRUB}" ]; then case "${GRUB_SET_REBOOT_ENTRY_METHOD:=grub-set-default}" in grub-set-default) @@ -42,6 +42,25 @@ case "${BOOT_MANAGER}" in mesg "reboot entry not set, can not reboot." fi ;; + grub2) + mount /boot + if [ -n "${REBOOT_ENTRY_GRUB}" ]; then + case "${GRUB_SET_REBOOT_ENTRY_METHOD:=grub2-set-default}" in + grub2-set-default) + if [ -x /usr/sbin/grub2-set-default ]; then + /usr/sbin/grub2-set-default "${REBOOT_ENTRY_GRUB}" + else + mesg "command grub2-set-default not found!" + fi + ;; + *) + mesg "Unknown grub method ${GRUB_SET_REBOOT_ENTRY_METHOD}." + ;; + esac + else + mesg "reboot entry not set, can not reboot." + fi + ;; lilo) mount /boot if [ -n "${REBOOT_ENTRY_LILO}" ]; then |