From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from asavdk4.altibox.net ([109.247.116.15]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQBgs-00051O-GA for barebox@lists.infradead.org; Tue, 05 Jun 2018 13:08:01 +0000 Date: Tue, 5 Jun 2018 15:07:38 +0200 From: Sam Ravnborg Message-ID: <20180605130738.GA31757@ravnborg.org> References: <20180605061248.24343-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180605061248.24343-1-o.rempel@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v1] defaultenv-2: make abort key to stop autoboot configurable To: Oleksij Rempel Cc: barebox@lists.infradead.org Hi Oleksij On Tue, Jun 05, 2018 at 08:12:48AM +0200, Oleksij Rempel wrote: > currently supported only two options: any key and ctrl-c > "any kay" is default option. Is Kay happy with that? (note: spelling error) > To configure it, use: > nv autoboot_abort_key=any > or > nv autoboot_abort_key=ctrl-c > > Signed-off-by: Oleksij Rempel > --- > Documentation/user/defaultenv-2.rst | 3 +++ > defaultenv/defaultenv-2-base/bin/init | 17 ++++++++++++++--- > 2 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/Documentation/user/defaultenv-2.rst b/Documentation/user/defaultenv-2.rst > index db74176b0..7502d3de1 100644 > --- a/Documentation/user/defaultenv-2.rst > +++ b/Documentation/user/defaultenv-2.rst > @@ -93,6 +93,9 @@ the :ref:`command_edit` command. Typical content: > # timeout in seconds before the default boot entry is started > #global.autoboot_timeout=3 > > + # key to abort autoboot. Supported options are: "any" and "ctrl-c" > + #global.autoboot_abort_key=any > + > # list of boot entries. These are executed in order until one > # succeeds. An entry can be: > # - a filename in /env/boot/ When touching this file - could you then also add a short explanation that: arch/$ARCH/boards//env Requires that CONFIG_DEFAULT_ENVIRONMENT_PATH are set to the above path. Otherwise I will cook up a small patch. (I was hit by this yesterday and missed it) > diff --git a/defaultenv/defaultenv-2-base/bin/init b/defaultenv/defaultenv-2-base/bin/init > index 6f3a34dba..d75f8e08a 100644 > --- a/defaultenv/defaultenv-2-base/bin/init > +++ b/defaultenv/defaultenv-2-base/bin/init > @@ -5,6 +5,7 @@ export PATH=/env/bin > global hostname > global user > global autoboot_timeout > +global autoboot_abort_key > global boot.default > global linux.bootargs.base > global linux.bootargs.console > @@ -18,6 +19,8 @@ global editcmd > magicvar -a global.user "username (used in network filenames)" > [ -z "${global.autoboot_timeout}" ] && global.autoboot_timeout=3 > magicvar -a global.autoboot_timeout "timeout in seconds before automatic booting" > +[ -z "${global.autoboot_abort_key}" ] && global.autoboot_abort_key=any > +magicvar -a global.autoboot_abort_key "key to abort automatic booting" Could you include in the description the available options? > [ -z "${global.boot.default}" ] && global.boot.default=net > [ -z "${global.editcmd}" ] && global.editcmd=sedit > > @@ -38,14 +41,22 @@ for i in /env/init/*; do > . $i > done > > +if [ "${global.autoboot_abort_key}" = "ctrl-c" ]; then > + abort_string="ctrl-c" > + abort_args="-c" > +else > + abort_string="any key" > + abort_args="-a" > +fi > + > if [ -e /env/menu ]; then > - echo -e -n "\nHit m for menu or any other key to stop autoboot: " > + echo -e -n "\nHit m for menu or $abort_string to stop autoboot: " This will read: "Hit m for menu or any to stop autoboot: " Add a "key" to make it more explicit: "Hit m for menu or any key to stop autoboot: " > else > - echo -e -n "\nHit any key to stop autoboot: " > + echo -e -n "\nHit $abort_string to stop autoboot: " > fi > > if [ "$autoboot" = 0 ]; then > - timeout -a $global.autoboot_timeout -v key > + timeout $abort_args $global.autoboot_timeout -v key > autoboot="$?" > fi Sam _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox