summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-06-16 03:59:04 +0000
committerMike Frysinger <vapier@gentoo.org>2014-06-16 03:59:04 +0000
commite2d901ef75714d08c70270cf97364d9e78a278c4 (patch)
tree783f44771e6bbc7ae33e9cb7fccf24ba20d907f9 /app-admin
parent2014.1.1 bup (diff)
downloadgentoo-2-e2d901ef75714d08c70270cf97364d9e78a278c4.tar.gz
gentoo-2-e2d901ef75714d08c70270cf97364d9e78a278c4.tar.bz2
gentoo-2-e2d901ef75714d08c70270cf97364d9e78a278c4.zip
Fix bashisms in /dev/null redirection.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/rsyslog/ChangeLog7
-rw-r--r--app-admin/rsyslog/files/7-stable/rsyslog.initd-r14
-rw-r--r--app-admin/rsyslog/files/7-stable/rsyslog.logrotate4
-rw-r--r--app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r14
4 files changed, 12 insertions, 7 deletions
diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index c13c46db76a5..57ca2ec740a2 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/rsyslog
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.115 2014/06/16 02:26:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.116 2014/06/16 03:59:04 vapier Exp $
+
+ 16 Jun 2014; Mike Frysinger <vapier@gentoo.org>
+ files/7-stable/rsyslog.initd-r1, files/7-stable/rsyslog.logrotate,
+ files/7-stable/rsyslog.logrotate-r1:
+ Fix bashisms in /dev/null redirection.
16 Jun 2014; Mike Frysinger <vapier@gentoo.org> rsyslog-7.6.3-r1.ebuild:
Add arm love #511026.
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
index 6aefada589e3..1e77c42b82cf 100644
--- a/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1,v 1.2 2014/06/02 11:55:36 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1,v 1.3 2014/06/16 03:59:03 vapier Exp $
RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
@@ -52,7 +52,7 @@ configtest() {
local _retval=0
ebegin "Checking rsyslogd's configuration"
- ${_test_command} &>/dev/null
+ ${_test_command} >/dev/null 2>&1
_retval=$?
if [ ${_retval} -ne 0 ]; then
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate
index df4153fed2af..0f2b3ff8d71c 100644
--- a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate
@@ -7,7 +7,7 @@
delaycompress
compress
postrotate
- kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null || true
+ kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1 || true
endscript
}
@@ -32,6 +32,6 @@
delaycompress
sharedscripts
postrotate
- kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null || true
+ kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1 || true
endscript
}
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
index 1eae30e0d741..15f32542df8a 100644
--- a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
@@ -9,7 +9,7 @@
# delaycompress
# compress
# postrotate
-# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1
# endscript
#}
@@ -32,6 +32,6 @@
delaycompress
sharedscripts
postrotate
- test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+ test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1
endscript
}