Date: Sun, 27 Jan 2013 06:02:38 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245962 - head/usr.sbin/newsyslog Message-ID: <201301270602.r0R62c1r012837@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Sun Jan 27 06:02:38 2013 New Revision: 245962 URL: http://svnweb.freebsd.org/changeset/base/245962 Log: Ensure that newsyslog -n prints the correct message for a rotation rule that uses the 'R' flag. Reviewed by: gad Approved by: rstone (co-mentor) MFC after: 1 week Modified: head/usr.sbin/newsyslog/newsyslog.c Modified: head/usr.sbin/newsyslog/newsyslog.c ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.c Sun Jan 27 06:01:35 2013 (r245961) +++ head/usr.sbin/newsyslog/newsyslog.c Sun Jan 27 06:02:38 2013 (r245962) @@ -1900,10 +1900,15 @@ do_sigwork(struct sigwork_entry *swork) } if (noaction) { - printf("\tkill -%d %d \t\t# %s\n", swork->sw_signum, - (int)swork->sw_pid, swork->sw_fname); - if (secs > 0) - printf("\tsleep %d\n", secs); + if (swork->run_cmd) + printf("\tsh -c '%s %d'\n", swork->sw_fname, + swork->sw_signum); + else { + printf("\tkill -%d %d \t\t# %s\n", swork->sw_signum, + (int)swork->sw_pid, swork->sw_fname); + if (secs > 0) + printf("\tsleep %d\n", secs); + } return; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301270602.r0R62c1r012837>