[gentoo-commits] gentoo-vdr r639 - in gentoo-vdr-scripts/trunk: . usr/share/vdr/bin

[Matthias Schwarzott (zzam)]

Author: zzam
Date: 2008-07-30 15:33:20 +0000 (Wed, 30 Jul 2008)
New Revision: 639

Added:
   gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh
Removed:
   gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh
Modified:
   gentoo-vdr-scripts/trunk/ChangeLog
Log:
Moved old root-part of shutdown to temp name.

Modified: gentoo-vdr-scripts/trunk/ChangeLog
===================================================================
--- gentoo-vdr-scripts/trunk/ChangeLog	2008-07-30 13:54:36 UTC (rev 638)
+++ gentoo-vdr-scripts/trunk/ChangeLog	2008-07-30 15:33:20 UTC (rev 639)
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo-vdr-scripts
 # $Id$
 
+  30 Jul 2008; Matthias Schwarzott <zzam@g.o> ++,
+  -usr/share/vdr/bin/vdrshutdown-really.sh:
+  Moved old root-part of shutdown to temp name.
+
   30 Jul 2008; Matthias Schwarzott <zzam@g.o>
   usr/share/vdr/rcscript/pre-start-45-locales.sh:
   Check locale setup as does all users of it, checking LC_ALL LC_CTYPE LANG.

Deleted: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh
===================================================================
--- gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh	2008-07-30 13:54:36 UTC (rev 638)
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh	2008-07-30 15:33:20 UTC (rev 639)
@@ -1,98 +0,0 @@
-#!/bin/sh
-# $Id$
-# Author:
-#   Matthias Schwarzott <zzam@×××.de>
-#
-
-#
-# This script is called from vdrshutdown-gate.sh over sudo to
-# have root-permissions for setting wakeup-time and triggering
-# real shutdown/reboot.
-#
-
-. /usr/share/vdr/inc/functions.sh
-include shutdown-functions
-shutdown_script_dir=/usr/share/vdr/shutdown
-
-if [ "$(id -u)" != "0" ]; then
-	echo "This program should be run as root"
-	exit 99
-fi
-
-if [ "${DEBUG}" -ge 1 ]; then
-	exec >/tmp/vdrshutdown-real-log 2>&1
-	echo Started debug output of $0 $@
-	set -x
-fi
-
-VDR_WAKEUP_TIME="${1}"
-
-SVDRPCMD=/usr/bin/svdrpsend.pl
-
-mesg() {
-	if type logger >/dev/null 2>&1; then
-		logger "$@"
-	fi
-}
-
-# A little bit complicated, but this is used to really check if a reboot is needed
-# nvram gets confused when setting the same time a second time
-# (when first shutdown-try fails for some reason).
-
-# to be called from wakeup-method to signalize need for reboot
-set_reboot_needed() {
-	date +%s > ${shutdown_data_dir}/shutdown-need-reboot
-}
-
-read_reboot_setting() {
-	NEED_REBOOT=0
-	[ -e "${shutdown_data_dir}/shutdown-need-reboot" ] || return
-	local TSTAMP=$(cat ${shutdown_data_dir}/shutdown-need-reboot)
-	local NOW=$(date +%s)
-
-	local REBOOT_SET_AGO=$(( $NOW-$TSTAMP ))
-	local UPTIME=$(cat /proc/uptime)
-	UPTIME=${UPTIME%%.*}
-
-	if [ "${REBOOT_SET_AGO}" -lt "${UPTIME}" ]; then
-		NEED_REBOOT=1
-	fi
-}
-
-
-WAKEUP_METHOD="${WAKEUP_METHOD:-rtc acpi nvram none}"
-
-run_wakeup_method()
-{
-	local mod="$1"
-	(
-		if [ -f "${shutdown_script_dir}/wakeup-${mod}.sh" ]; then
-			. ${shutdown_script_dir}/wakeup-${mod}.sh
-		else
-			return 1
-		fi
-	)
-}
-
-wakeup_ok=0
-for method in ${WAKEUP_METHOD}; do
-	if run_wakeup_method "${method}"; then
-		wakeup_ok=1
-		break
-	fi
-done
-[ ${wakeup_ok} = 0 ] && exit 99
-
-if [ "${DRY_SHUTDOWN}" = "1" ]; then
-	exit 0
-fi
-
-read_reboot_setting
-
-case "${NEED_REBOOT}" in
-	1)	. ${shutdown_script_dir}/shutdown-reboot.sh ;;
-	0)	. ${shutdown_script_dir}/shutdown-halt.sh ;;
-esac
-
-exit 0
-

Copied: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh (from rev 638, gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh)
===================================================================
--- gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh	                        (rev 0)
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh	2008-07-30 15:33:20 UTC (rev 639)
@@ -0,0 +1,98 @@
+#!/bin/sh
+# $Id$
+# Author:
+#   Matthias Schwarzott <zzam@×××.de>
+#
+
+#
+# This script is called from vdrshutdown-gate.sh over sudo to
+# have root-permissions for setting wakeup-time and triggering
+# real shutdown/reboot.
+#
+
+. /usr/share/vdr/inc/functions.sh
+include shutdown-functions
+shutdown_script_dir=/usr/share/vdr/shutdown
+
+if [ "$(id -u)" != "0" ]; then
+	echo "This program should be run as root"
+	exit 99
+fi
+
+if [ "${DEBUG}" -ge 1 ]; then
+	exec >/tmp/vdrshutdown-real-log 2>&1
+	echo Started debug output of $0 $@
+	set -x
+fi
+
+VDR_WAKEUP_TIME="${1}"
+
+SVDRPCMD=/usr/bin/svdrpsend.pl
+
+mesg() {
+	if type logger >/dev/null 2>&1; then
+		logger "$@"
+	fi
+}
+
+# A little bit complicated, but this is used to really check if a reboot is needed
+# nvram gets confused when setting the same time a second time
+# (when first shutdown-try fails for some reason).
+
+# to be called from wakeup-method to signalize need for reboot
+set_reboot_needed() {
+	date +%s > ${shutdown_data_dir}/shutdown-need-reboot
+}
+
+read_reboot_setting() {
+	NEED_REBOOT=0
+	[ -e "${shutdown_data_dir}/shutdown-need-reboot" ] || return
+	local TSTAMP=$(cat ${shutdown_data_dir}/shutdown-need-reboot)
+	local NOW=$(date +%s)
+
+	local REBOOT_SET_AGO=$(( $NOW-$TSTAMP ))
+	local UPTIME=$(cat /proc/uptime)
+	UPTIME=${UPTIME%%.*}
+
+	if [ "${REBOOT_SET_AGO}" -lt "${UPTIME}" ]; then
+		NEED_REBOOT=1
+	fi
+}
+
+
+WAKEUP_METHOD="${WAKEUP_METHOD:-rtc acpi nvram none}"
+
+run_wakeup_method()
+{
+	local mod="$1"
+	(
+		if [ -f "${shutdown_script_dir}/wakeup-${mod}.sh" ]; then
+			. ${shutdown_script_dir}/wakeup-${mod}.sh
+		else
+			return 1
+		fi
+	)
+}
+
+wakeup_ok=0
+for method in ${WAKEUP_METHOD}; do
+	if run_wakeup_method "${method}"; then
+		wakeup_ok=1
+		break
+	fi
+done
+[ ${wakeup_ok} = 0 ] && exit 99
+
+if [ "${DRY_SHUTDOWN}" = "1" ]; then
+	exit 0
+fi
+
+read_reboot_setting
+
+case "${NEED_REBOOT}" in
+	1)	. ${shutdown_script_dir}/shutdown-reboot.sh ;;
+	0)	. ${shutdown_script_dir}/shutdown-halt.sh ;;
+esac
+
+exit 0
+


Property changes on: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:mergeinfo
   +