Signed-off-by: Sebastien Luttringer --- adjtime.cron | 2 +- functions | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adjtime.cron b/adjtime.cron index dac8cea..8a894f1 100755 --- a/adjtime.cron +++ b/adjtime.cron @@ -10,6 +10,6 @@ case $HARDWARECLOCK in *) HWCLOCK_PARAMS="";; esac -if [[ $HWCLOCK_PARAMS && -f /var/run/daemons/hwclock ]]; then +if [[ $HWCLOCK_PARAMS && -f /run/daemons/hwclock ]]; then /sbin/hwclock $HWCLOCK_PARAMS fi diff --git a/functions b/functions index e0f3bec..66b4957 100644 --- a/functions +++ b/functions @@ -158,16 +158,16 @@ in_array() { # daemons: add_daemon() { - [[ -d /var/run/daemons ]] || /bin/mkdir -p /var/run/daemons - > /var/run/daemons/"$1" + [[ -d /run/daemons ]] || /bin/mkdir -p /run/daemons + > /run/daemons/"$1" } rm_daemon() { - /bin/rm -f /var/run/daemons/"$1" + /bin/rm -f /run/daemons/"$1" } ck_daemon() { - [[ ! -f /var/run/daemons/$1 ]] + [[ ! -f /run/daemons/$1 ]] } # Check if $1 is a valid daemon name @@ -226,7 +226,7 @@ kill_everything() { # $1 = where we are being called from. # This is used to determine which hooks to run. # Find daemons NOT in the DAEMONS array. Shut these down first - for daemon in /var/run/daemons/*; do + for daemon in /run/daemons/*; do [[ -f $daemon ]] || continue daemon=${daemon##*/} in_array "$daemon" "${DAEMONS[@]}" || stop_daemon "$daemon" -- Sebastien "Seblu" Luttringer

If someone with commit rights sees this, it would be much appreciated if they could add my Signed-off-by: Tom Gundersen and push this commit. Cheers, Tom On Sun, Apr 10, 2011 at 9:16 AM, Sebastien Luttringer wrote:

Signed-off-by: Sebastien Luttringer ---  rc.sysinit |    4 ++--  1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rc.sysinit b/rc.sysinit index 971d6b0..bfde7a8 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -275,8 +275,8 @@ stat_busy "Mounting Local Filesystems"

 # don't touch /etc/mtab if it is a symlink to /proc/self/mounts  if [[ -L /etc/mtab ]]; then -       ; -elif [[ -x /bin/findmnt -a -e /proc/self/mountinfo ]]; then +       : +elif [[ -x /bin/findmnt && -e /proc/self/mountinfo ]]; then        /bin/findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS >| /etc/mtab  else        cat /proc/mounts >| /etc/mtab -- Sebastien "Seblu" Luttringer