--- /usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh 2018-02-03 21:49:38.516984206 +0100
+++ /usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh 2018-02-03 21:39:21.397421974 +0100
@@ -1,11 +1,11 @@
 # $Id: 5783cb343138def65e48b0b28a4b1f97a68f88d9 $
 
-if [ ! -f /etc/init.d/sysfs ]; then
-# Baselayout 1
-. /etc/conf.d/clock
-    else
-# Baselayout 2
-. /etc/conf.d/hwclock
+if [ ! -f /etc/init.d/sysfs ] && [ -f /etc/conf.d/clock ]; then
+  # Baselayout 1
+  . /etc/conf.d/clock
+else
+  # Baselayout 2
+  . /etc/conf.d/hwclock
 fi
 
 
@@ -15,7 +15,7 @@
 
 if yesno "${SHUTDOWN_SYSTOHC:-no}"; then
 
-    if [ ${CLOCK_SYSTOHC:=no} == "no" ] || [ ${clock_systohc:=NO} == "NO" ] ;then
+    if [ ${CLOCK_SYSTOHC:=no} == "no" ] || [ ${clock_systohc:=NO} == "NO" ]; then
 
         do_systohc