diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | usr/share/vdr/bin/vdrrecord-gate.sh | 2 | ||||
| -rw-r--r-- | usr/share/vdr/bin/vdrshutdown-gate.sh | 9 | ||||
| -rw-r--r-- | usr/share/vdr/inc/message-functions.sh | 2 | ||||
| -rw-r--r-- | usr/share/vdr/rcscript/pre-start-30-parameter.sh | 2 | ||||
| -rw-r--r-- | usr/share/vdr/rcscript/pre-start-50-shutdown.sh | 9 | ||||
| -rw-r--r-- | usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh | 2 |
8 files changed, 27 insertions, 12 deletions
@@ -1,6 +1,15 @@ # ChangeLog for gentoo-vdr-scripts # $Id$ + 09 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> + usr/share/vdr/rcscript/pre-start-30-parameter.sh, + usr/share/vdr/rcscript/pre-start-50-shutdown.sh, + usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh, Makefile, + usr/share/vdr/bin/vdrrecord-gate.sh, + usr/share/vdr/bin/vdrshutdown-gate.sh, + usr/share/vdr/inc/message-functions.sh: + Changed every reference to /usr/lib/vdr/bin. + 09 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> -usr/lib/vdr/bin +usr/share/vdr/bin: Moved usr/lib/vdr/bin to usr/share/vdr/bin @@ -46,8 +46,8 @@ endif mkdir -p $(DESTDIR)/usr/share/vdr/record install -m 0644 -o root -g root usr/share/vdr/record/*.sh $(DESTDIR)/usr/share/vdr/record/ - mkdir -p $(DESTDIR)/usr/lib/vdr/bin - install -m 0755 -o root -g root usr/lib/vdr/bin/*.sh $(DESTDIR)/usr/lib/vdr/bin/ + mkdir -p $(DESTDIR)/usr/share/vdr/bin + install -m 0755 -o root -g root usr/share/vdr/bin/*.sh $(DESTDIR)/usr/share/vdr/bin/ mkdir -p $(DESTDIR)/var/vdr/{shutdown-data,merged-config-files} chown vdr:vdr -R $(DESTDIR)/var/vdr diff --git a/usr/share/vdr/bin/vdrrecord-gate.sh b/usr/share/vdr/bin/vdrrecord-gate.sh index a6d3641..ed5667d 100644 --- a/usr/share/vdr/bin/vdrrecord-gate.sh +++ b/usr/share/vdr/bin/vdrrecord-gate.sh @@ -6,7 +6,7 @@ #fork to background if [[ -z ${EXECUTED_BY_VDR_BG} ]]; then - exec /usr/lib/vdr/bin/vdr-bg.sh "${0}" "${@}" + exec /usr/share/vdr/bin/vdr-bg.sh "${0}" "${@}" exit fi diff --git a/usr/share/vdr/bin/vdrshutdown-gate.sh b/usr/share/vdr/bin/vdrshutdown-gate.sh index 8a6f670..0328188 100644 --- a/usr/share/vdr/bin/vdrshutdown-gate.sh +++ b/usr/share/vdr/bin/vdrshutdown-gate.sh @@ -9,7 +9,7 @@ #fork to background if [[ -z ${EXECUTED_BY_VDR_BG} ]]; then - exec /usr/lib/vdr/bin/vdr-bg.sh "${0}" "${@}" + exec /usr/share/vdr/bin/vdr-bg.sh "${0}" "${@}" exit fi @@ -216,14 +216,17 @@ fi # You have to edit sudo-permissions to grant vdr permission to execute # privileged commands. Start visudo and add a line like -# vdr ALL= NOPASSWD: /usr/lib/vdr/bin/vdrshutdown-really.sh +# vdr ALL= NOPASSWD: /usr/share/vdr/bin/vdrshutdown-really.sh #mesg_q "Dummy - Real shutdown not working" SUDO=/usr/bin/sudo if [[ -z ${DRY_SHUTDOWN} ]]; then - ${SUDO} /usr/lib/vdr/bin/vdrshutdown-really.sh ${VDR_TIMER_NEXT} + if ! ${SUDO} /usr/share/vdr/bin/vdrshutdown-really.sh ${VDR_TIMER_NEXT}; then + mesg_q "sudo failed" + mesg_q "call emerge --config gentoo-vdr-scripts" + fi else logger DRY_SHUTDOWN shutdown, vdrshutdown-really.sh ${VDR_TIMER_NEXT} fi diff --git a/usr/share/vdr/inc/message-functions.sh b/usr/share/vdr/inc/message-functions.sh index a26f1be..300b6c0 100644 --- a/usr/share/vdr/inc/message-functions.sh +++ b/usr/share/vdr/inc/message-functions.sh @@ -16,7 +16,7 @@ finish_vdr_start_log() if [[ ${LOG_ERROR_COUNT} = 0 ]]; then vdr_log_generic "NO problems at start." else - /usr/lib/vdr/bin/vdr-bg.sh svdrpsend.pl mesg "Errors: View via Commands / View VDR Start Log" + /usr/share/vdr/bin/vdr-bg.sh svdrpsend.pl mesg "Errors: View via Commands / View VDR Start Log" fi VDR_LOG_FILE="" } diff --git a/usr/share/vdr/rcscript/pre-start-30-parameter.sh b/usr/share/vdr/rcscript/pre-start-30-parameter.sh index 8ffff1e..3599e8b 100644 --- a/usr/share/vdr/rcscript/pre-start-30-parameter.sh +++ b/usr/share/vdr/rcscript/pre-start-30-parameter.sh @@ -29,7 +29,7 @@ addon_main() { add_param "--vfat" fi - add_param "--record=/usr/lib/vdr/bin/vdrrecord-gate.sh" + add_param "--record=/usr/share/vdr/bin/vdrrecord-gate.sh" if [[ -n "${VDR_EXTRA_OPTIONS}" ]]; then add_param ${VDR_EXTRA_OPTIONS} diff --git a/usr/share/vdr/rcscript/pre-start-50-shutdown.sh b/usr/share/vdr/rcscript/pre-start-50-shutdown.sh index ed29d17..dfd61fa 100644 --- a/usr/share/vdr/rcscript/pre-start-50-shutdown.sh +++ b/usr/share/vdr/rcscript/pre-start-50-shutdown.sh @@ -28,11 +28,14 @@ addon_main() { # no custum shutdown-script # test for good sudo-configuration - if ! grep -q /usr/lib/vdr/bin/vdrshutdown-really.sh /etc/sudoers; then + if ! grep -q /usr/share/vdr/bin/vdrshutdown-really.sh /etc/sudoers; then vdr_ewarn " missing entry in /etc/sudoers" vdr_einfo vdr_einfo " please add this line to your /etc/sudoers file" - vdr_einfo " vdr ALL=NOPASSWD:/usr/lib/vdr/bin/vdrshutdown-really.sh" + vdr_einfo " vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh" + vdr_einfo + vdr_einfo " or call emerge --config gentoo-vdr-scripts" + vdr_einfo shutdown_disabled return 0 fi @@ -53,7 +56,7 @@ addon_main() { return 0 fi - add_param "--shutdown=/usr/lib/vdr/bin/vdrshutdown-gate.sh" + add_param "--shutdown=/usr/share/vdr/bin/vdrshutdown-gate.sh" return 0 } diff --git a/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh b/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh index f0b8fe2..ddc0448 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh @@ -43,7 +43,7 @@ check_periodic_thread() disable_auto_retry # can take longer time - /usr/lib/vdr/bin/vdr-bg.sh /usr/lib/vdr/bin/vdrshutdown-periodic-thread.sh & + /usr/share/vdr/bin/vdr-bg.sh /usr/share/vdr/bin/vdrshutdown-periodic-thread.sh & } check_periodic_thread |