| 1 |
Author: zzam |
| 2 |
Date: 2008-04-19 15:57:25 +0000 (Sat, 19 Apr 2008) |
| 3 |
New Revision: 590 |
| 4 |
|
| 5 |
Modified: |
| 6 |
gentoo-vdr-scripts/trunk/ChangeLog |
| 7 |
gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown |
| 8 |
gentoo-vdr-scripts/trunk/usr/share/vdr/shutdown/shutdown-reboot.sh |
| 9 |
Log: |
| 10 |
Give an explicit name to the automagic reboot handling - auto. |
| 11 |
|
| 12 |
Modified: gentoo-vdr-scripts/trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- gentoo-vdr-scripts/trunk/ChangeLog 2008-04-19 12:55:53 UTC (rev 589) |
| 15 |
+++ gentoo-vdr-scripts/trunk/ChangeLog 2008-04-19 15:57:25 UTC (rev 590) |
| 16 |
@@ -2,6 +2,10 @@ |
| 17 |
# $Id$ |
| 18 |
|
| 19 |
19 Apr 2008; Matthias Schwarzott <zzam@g.o> |
| 20 |
+ etc/conf.d/vdr.shutdown, usr/share/vdr/shutdown/shutdown-reboot.sh: |
| 21 |
+ Give an explicit name to the automagic reboot handling - auto. |
| 22 |
+ |
| 23 |
+ 19 Apr 2008; Matthias Schwarzott <zzam@g.o> |
| 24 |
usr/share/vdr/rcscript/pre-start-45-utf8-check.sh: |
| 25 |
Make charmap handling more verbose and fix some export/usage order. Bug |
| 26 |
#217906 |
| 27 |
|
| 28 |
Modified: gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown |
| 29 |
=================================================================== |
| 30 |
--- gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown 2008-04-19 12:55:53 UTC (rev 589) |
| 31 |
+++ gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown 2008-04-19 15:57:25 UTC (rev 590) |
| 32 |
@@ -90,8 +90,9 @@ |
| 33 |
|
| 34 |
# |
| 35 |
# Only used for WAKEUP_METHOD nvram when motherboard needs reboot |
| 36 |
-# allowed values: lilo grub |
| 37 |
-# default: use a special startup-script to shutdown the system, works good but needs a bit more time |
| 38 |
+# allowed values: auto grub lilo |
| 39 |
+# default: use auto - use a special startup-script, no need to play with boot-managers :) |
| 40 |
+#BOOT_MANAGER="auto" |
| 41 |
#BOOT_MANAGER="grub" |
| 42 |
|
| 43 |
# |
| 44 |
|
| 45 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/shutdown/shutdown-reboot.sh |
| 46 |
=================================================================== |
| 47 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/shutdown/shutdown-reboot.sh 2008-04-19 12:55:53 UTC (rev 589) |
| 48 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/shutdown/shutdown-reboot.sh 2008-04-19 15:57:25 UTC (rev 590) |
| 49 |
@@ -5,11 +5,11 @@ |
| 50 |
# |
| 51 |
|
| 52 |
if [ -z "${BOOT_MANAGER}" ]; then |
| 53 |
- BOOT_MANAGER="none" |
| 54 |
+ BOOT_MANAGER="auto" |
| 55 |
fi |
| 56 |
|
| 57 |
case "${BOOT_MANAGER}" in |
| 58 |
- none) |
| 59 |
+ auto) |
| 60 |
if [ ! -L /etc/runlevels/boot/wakeup-reboot-halt ]; then |
| 61 |
rc-update add wakeup-reboot-halt boot |
| 62 |
fi |
| 63 |
|
| 64 |
-- |
| 65 |
gentoo-commits@l.g.o mailing list |
Archives