From owner-svn-src-stable-10@freebsd.org  Tue Sep 22 11:38:59 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA83EA05033;
 Tue, 22 Sep 2015 11:38:59 +0000 (UTC) (envelope-from jlh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B2F9118D7;
 Tue, 22 Sep 2015 11:38:59 +0000 (UTC) (envelope-from jlh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8MBcxjc002802;
 Tue, 22 Sep 2015 11:38:59 GMT (envelope-from jlh@FreeBSD.org)
Received: (from jlh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8MBcxGK002801;
 Tue, 22 Sep 2015 11:38:59 GMT (envelope-from jlh@FreeBSD.org)
Message-Id: <201509221138.t8MBcxGK002801@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jlh set sender to jlh@FreeBSD.org
 using -f
From: Jeremie Le Hen <jlh@FreeBSD.org>
Date: Tue, 22 Sep 2015 11:38:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r288107 - stable/10/etc/defaults
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Sep 2015 11:38:59 -0000

Author: jlh
Date: Tue Sep 22 11:38:58 2015
New Revision: 288107
URL: https://svnweb.freebsd.org/changeset/base/288107

Log:
  Long overdue MFC r285444:
    Allow again periodic scripts to be run from command-line.
  
    PR:           188109
    Submitted by: Jason Unovitch

Modified:
  stable/10/etc/defaults/periodic.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/defaults/periodic.conf
==============================================================================
--- stable/10/etc/defaults/periodic.conf	Tue Sep 22 11:25:37 2015	(r288106)
+++ stable/10/etc/defaults/periodic.conf	Tue Sep 22 11:38:58 2015	(r288107)
@@ -365,8 +365,12 @@ if [ -z "${source_periodic_confs_defined
 			*) return 0 ;;
 			esac
 			;;
+                '')
+                        # Script run manually.
+                        return 0
+                        ;;
 		*)
-			echo "ASSERTION FAILED: Unexpected value for " \
+			echo "ASSERTION FAILED: Unexpected value for" \
 			    "\$PERIODIC: '$PERIODIC'" >&2
 			exit 127
 			;;