From owner-svn-src-head@freebsd.org  Mon Jul 13 10:15:02 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 D1A17999202;
 Mon, 13 Jul 2015 10:15:02 +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 B991BCA8;
 Mon, 13 Jul 2015 10:15:02 +0000 (UTC) (envelope-from jlh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6DAF2rQ025101;
 Mon, 13 Jul 2015 10:15:02 GMT (envelope-from jlh@FreeBSD.org)
Received: (from jlh@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6DAF2rV025100;
 Mon, 13 Jul 2015 10:15:02 GMT (envelope-from jlh@FreeBSD.org)
Message-Id: <201507131015.t6DAF2rV025100@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: Mon, 13 Jul 2015 10:15:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285444 - head/etc/defaults
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2015 10:15:02 -0000

Author: jlh
Date: Mon Jul 13 10:15:01 2015
New Revision: 285444
URL: https://svnweb.freebsd.org/changeset/base/285444

Log:
  Allow again periodic scripts to be run from command-line.
  
  PR:		188109
  Submitted by:	Jason Unovitch
  MFC after:	1 week

Modified:
  head/etc/defaults/periodic.conf

Modified: head/etc/defaults/periodic.conf
==============================================================================
--- head/etc/defaults/periodic.conf	Mon Jul 13 09:12:05 2015	(r285443)
+++ head/etc/defaults/periodic.conf	Mon Jul 13 10:15:01 2015	(r285444)
@@ -357,8 +357,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
 			;;