From owner-freebsd-rc@FreeBSD.ORG Wed Nov 15 21:50:26 2006 Return-Path: X-Original-To: freebsd-rc@hub.freebsd.org Delivered-To: freebsd-rc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3A1616A494 for ; Wed, 15 Nov 2006 21:50:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8616943D81 for ; Wed, 15 Nov 2006 21:50:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAFLoEQM051931 for ; Wed, 15 Nov 2006 21:50:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAFLoEZO051930; Wed, 15 Nov 2006 21:50:14 GMT (envelope-from gnats) Date: Wed, 15 Nov 2006 21:50:14 GMT Message-Id: <200611152150.kAFLoEZO051930@freefall.freebsd.org> To: freebsd-rc@FreeBSD.org From: "Pietro Cerutti" Cc: Subject: Re: conf/105568: [patch] Add more flexibility to rc.conf, to choose "_enable" values at startup X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Pietro Cerutti List-Id: "Discussion related to /etc/rc.d design and implementation." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Nov 2006 21:50:26 -0000 The following reply was made to PR conf/105568; it has been noted by GNATS. From: "Pietro Cerutti" To: bug-followup@freebsd.org Cc: Subject: Re: conf/105568: [patch] Add more flexibility to rc.conf, to choose "_enable" values at startup Date: Wed, 15 Nov 2006 22:49:17 +0100 The patch is inline: --- /etc/rc.subr.orig Wed Nov 15 14:03:59 2006 +++ /etc/rc.subr Wed Nov 15 20:10:32 2006 @@ -56,6 +56,8 @@ ID="/usr/bin/id" JID=`ps -p $$ -o jid=` IDCMD="if [ -x $ID ]; then $ID -un; fi" +ASK_TIMEOUT="5s" +ASK_DEFAULT="YES" case ${OSTYPE} in FreeBSD) @@ -122,7 +124,8 @@ # # checkyesno var -# Test $1 variable, and warn if not set to YES or NO. +# Test $1 variable, and warn if not set to YES, NO or ASK. +# If it's "ask", let the user choose at runtime between "yes" and "no". # Return 0 if it's "yes" (et al), nonzero otherwise. # checkyesno() @@ -140,7 +143,52 @@ [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1 ;; - *) + + # "ask" + [Aa][Ss][Kk]) + + # answer already stored in .ask file, + # this should be the case on shutdown + _file="/var/run/$name.ask" + if [ -f $_file ]; then + read _response < $_file + if checkyesno _response; then + return 0 + else + return 1 + fi + fi + # prompt and save choice to file, + # this should be the case on startup + + # Read timeout and default answer for daemon + eval _timeout=\$${name}_ask_timeout + eval _response=\$${name}_ask_default + + if [ ! $_timeout ]; then + _timeout=$ASK_TIMEOUT + fi + + if [ ! $_response ]; then + _response=$ASK_DEFAULT + fi + + read -t $_timeout -p "RC_ASK - Enable $name? [yes|no] " _enable + if [ $? -eq 1 ]; then + _enable=${_response} + fi + if checkyesno _enable; then + _choice="yes" + _return=0 + else + _choice="no" + _return=1 + fi + echo "$_choice" > $_file + return $_return; + ;; + + *) warn "\$${1} is not set properly - see ${rcvar_manpage}." return 1 ;;