From owner-svn-soc-all@freebsd.org Sat Jul 18 13:36:10 2015 Return-Path: Delivered-To: svn-soc-all@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 C35DB9A38A1 for ; Sat, 18 Jul 2015 13:36:10 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 B462C1FAD for ; Sat, 18 Jul 2015 13:36:10 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6IDaAQa054993 for ; Sat, 18 Jul 2015 13:36:10 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6IDaAp5054989 for svn-soc-all@FreeBSD.org; Sat, 18 Jul 2015 13:36:10 GMT (envelope-from def@FreeBSD.org) Date: Sat, 18 Jul 2015 13:36:10 GMT Message-Id: <201507181336.t6IDaAp5054989@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288532 - soc2013/def/crashdump-head/etc/rc.d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2015 13:36:10 -0000 Author: def Date: Sat Jul 18 13:36:09 2015 New Revision: 288532 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288532 Log: Implement stop command in cryptcore rc.d script. Modified: soc2013/def/crashdump-head/etc/rc.d/cryptcore Modified: soc2013/def/crashdump-head/etc/rc.d/cryptcore ============================================================================== --- soc2013/def/crashdump-head/etc/rc.d/cryptcore Sat Jul 18 13:19:42 2015 (r288531) +++ soc2013/def/crashdump-head/etc/rc.d/cryptcore Sat Jul 18 13:36:09 2015 (r288532) @@ -8,16 +8,22 @@ name="cryptcore" rcvar="cryptcore_enable" +start_precmd="${name}_check" start_cmd="${name}_start" -stop_cmd=":" +stop_precmd="${name}_check" +stop_cmd="${name}_stop" -cryptcore_start() +cryptcore_check() { sysctl -Nq security.ekcd.enable >/dev/null if [ $? -ne 0 ]; then err 1 "Kernel is missing encrypted kernel crash dumps." fi +} + +cryptcore_start() +{ if [ ! -f "${cryptcore_pubkey}" ]; then err 1 "Invalid path to a public key." @@ -31,5 +37,11 @@ sysctl security.ekcd.enable=1 } +cryptcore_stop() +{ + + sysctl security.ekcd.enable=0 +} + load_rc_config $name run_rc_command "$1"