From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-954301-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id C9FD4139696
	for <garchives@archives.gentoo.org>; Wed,  7 Jun 2017 16:34:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D165021C03C;
	Wed,  7 Jun 2017 16:34:40 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AA25421C03C
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Jun 2017 16:34:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 6CC6E341907
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Jun 2017 16:34:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A2E637470
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Jun 2017 16:34:37 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1496851182.84d140a1f6abf95a4170d13527152d3ab14e6613.williamh@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: scripts/
X-VCS-Repository: proj/openrc
X-VCS-Files: scripts/shutdown.in
X-VCS-Directories: scripts/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 84d140a1f6abf95a4170d13527152d3ab14e6613
X-VCS-Branch: master
Date: Wed,  7 Jun 2017 16:34:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: e9fb12fe-28c0-4621-9142-4b9d9df48a0a
X-Archives-Hash: cf1badf83d2864a1abc207fa821d24e7

commit:     84d140a1f6abf95a4170d13527152d3ab14e6613
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jun  7 15:59:42 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun  7 15:59:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=84d140a1

scripts/shutdown: pass --single to openrc-shutdown

Sysvinit shutdown has a default of single user mode, but openrc-shutdown
makes you choose a default action. Because of this, the shutdown wrapper
needs to pass --single to openrc-shutdown.

 scripts/shutdown.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/shutdown.in b/scripts/shutdown.in
index 6bb65260..4f6ba637 100644
--- a/scripts/shutdown.in
+++ b/scripts/shutdown.in
@@ -1,3 +1,8 @@
 #!@SHELL@
 
-exec @SBINDIR@/openrc-shutdown "$@"
+args="$@"
+case "$@" in
+	*--single*|*-s*) args="$@" ;;
+	*) args="--single $@";;
+esac
+exec @SBINDIR@/openrc-shutdown "$args"