Index: stable/10/etc/periodic/daily/999.local =================================================================== --- stable/10/etc/periodic/daily/999.local (revision 319220) +++ stable/10/etc/periodic/daily/999.local (revision 319221) @@ -1,38 +1,43 @@ #!/bin/sh # # $FreeBSD$ # # Run the old /etc/daily.local script. This is really for backwards # compatibility more than anything else. # # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] then . /etc/defaults/periodic.conf source_periodic_confs fi rc=0 for script in $daily_local do echo '' case "$script" in /*) - if [ -f "$script" ] + if [ -x "$script" ] + then + echo "Running $script:" + + $script || rc=3 + elif [ -f "$script" ] then echo "Running $script:" sh $script || rc=3 else echo "$script: No such file" [ $rc -lt 2 ] && rc=2 fi;; *) echo "$script: Not an absolute path" [ $rc -lt 2 ] && rc=2;; esac done exit $rc Index: stable/10/etc/periodic/monthly/999.local =================================================================== --- stable/10/etc/periodic/monthly/999.local (revision 319220) +++ stable/10/etc/periodic/monthly/999.local (revision 319221) @@ -1,35 +1,40 @@ #!/bin/sh - # # $FreeBSD$ # # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] then . /etc/defaults/periodic.conf source_periodic_confs fi rc=0 for script in $monthly_local do echo '' case "$script" in /*) - if [ -f "$script" ] + if [ -x "$script" ] + then + echo "Running $script:" + + $script || rc=3 + elif [ -f "$script" ] then echo "Running $script:" sh $script || rc=3 else echo "$script: No such file" [ $rc -lt 2 ] && rc=2 fi;; *) echo "$script: Not an absolute path" [ $rc -lt 2 ] && rc=2;; esac done exit $rc Index: stable/10/etc/periodic/weekly/999.local =================================================================== --- stable/10/etc/periodic/weekly/999.local (revision 319220) +++ stable/10/etc/periodic/weekly/999.local (revision 319221) @@ -1,35 +1,40 @@ #!/bin/sh - # # $FreeBSD$ # # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] then . /etc/defaults/periodic.conf source_periodic_confs fi rc=0 for script in $weekly_local do echo '' case "$script" in /*) - if [ -f "$script" ] + if [ -x "$script" ] + then + echo "Running $script:" + + $script || rc=3 + elif [ -f "$script" ] then echo "Running $script:" sh $script || rc=3 else echo "$script: No such file" [ $rc -lt 2 ] && rc=2 fi;; *) echo "$script: Not an absolute path" [ $rc -lt 2 ] && rc=2;; esac done exit $rc Index: stable/10 =================================================================== --- stable/10 (revision 319220) +++ stable/10 (revision 319221) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r313069