[arch-general] [PATCH 20/48] Shorten domainname and rc.local.shutdown conditional execution.

--- rc.shutdown | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/rc.shutdown b/rc.shutdown index 4eb29cc..002a45d 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -16,13 +16,9 @@ printhl "Initiating Shutdown..." echo " " # avoid NIS hanging syslog-ng on shutdown by unsetting the domainname -if [ -x /bin/domainname ]; then - /bin/domainname "" -fi +[[ -x /bin/domainname ]] && /bin/domainname "" +[[ -x /etc/rc.local.shutdown ]] && /etc/rc.local.shutdown -if [ -x /etc/rc.local.shutdown ]; then - /etc/rc.local.shutdown -fi # Find daemons NOT in the DAEMONS array. Shut these down first if [ -d /var/run/daemons ]; then -- 1.7.1