[PATCH 7/7] defaultenv-2: add boot sequence

[Sascha Hauer]

On Wed, Sep 12, 2012 at 11:01:28AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 09:20 Wed 12 Sep     , Sascha Hauer wrote:
> > On Tue, Sep 11, 2012 at 12:19:27PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > Boot will boot run sequentially the script in /env/boot.d
> > > 
> > > diff --git a/defaultenv-2/base/bin/boot b/defaultenv-2/base/bin/boot
> > > index 103eb87..68e9e89 100644
> > > --- a/defaultenv-2/base/bin/boot
> > > +++ b/defaultenv-2/base/bin/boot
> > > @@ -2,6 +2,8 @@
> > >  
> > >  verbose=
> > >  dryrun=
> > > +# ensure sequence is init at something
> > > +sequence=t
> > 
> > This looks unnecessary.
> I beleive it too but 
> no as you run boot again the sequence keep the previous set I set it after
> trial

Then you must have exported it from the command line before calling the
script. Initializing variables is a good idea, but you should set it to
be empty.

> > 
> > >  
> > >  usage="
> > >  $0 [OPTIONS] [source]\n
> > > @@ -10,11 +12,27 @@ $0 [OPTIONS] [source]\n
> > >   -l  list boot sources\n
> > >   -h  help"
> > >  
> > > +. /env/data/ansi-colors
> > > +
> > >  for i in /env/boot/*; do
> > >  	basename $i s
> > >  	sources="$sources$s "
> > >  done
> > >  
> > > +if [ -d /env/boot.d ]; then
> > > +	sources="$sources\n\nboot sequence:"
> > > +	for i in /env/boot.d/*; do
> > > +		readlink -f $i s
> > > +		basename $s link
> > > +		basename $i s
> > > +		sources="$sources\n ${YELLOW}${s}${NC} -> ${CYAN}${link}${NC}"
> > > +	done
> > > +else
> > > +	sequence=n
> > > +	sources="$sources\n\nboot sequence:\nnone"
> > > +	echo "${RED}WARNING: boot sequence: none${NC}"

-e missing here.

> > > +fi
> > > +
> > >  while getopt "vdhl" opt; do
> > >  	if [ ${opt} = v ]; then
> > >  		if [ -n "$verbose" ]; then
> > > @@ -23,7 +41,7 @@ while getopt "vdhl" opt; do
> > >  			verbose="-v"
> > >  		fi
> > >  	elif [ ${opt} = d ]; then
> > > -		dryrun=1
> > > +		dryrun="-d"
> > >  	elif [ ${opt} = l ]; then
> > >  		echo -e "boot sources:\n$sources"
> > >  		exit 0
> > > @@ -37,18 +55,39 @@ done
> > >  global -r linux.bootargs.dyn.
> > >  global -r bootm.
> > >  
> > > -if [ $# = 0 ]; then
> > > -	scr="$global.boot.default"
> > > +if [ $# = 0 -a "x$sequence" = "xt" ]; then
> > > +	sequence=y
> > >  else
> > >  	scr="$1"
> > >  fi
> > 
> > You could merge the 'if [ -d /env/boot.d ]' above with this if/else. The
> > result would be easier to read IMO.
> > Also you don't seem to catch the case when no /env/boot.d/* exist and
> > nothing is given on the command line.
> the idea it to check bot /env/boot.d and /env/boot as you may want to boot
> something no in the boot sequence but for test as example

> > 
> > >  
> > > +if [ "x$sequence" = "xy" ]; then
> > 
> > This x quirk is not necessary anymore. Do if [ "$sequence" = y ]
> > instead.
> > 
> > > +	if [ ! -d /env/boot.d ]; then
> > > +		echo -e "${GREEN}boot sequence ${RED}none${NC}"
> > > +		exit 1
> > > +	fi
> > > +	echo -e "${GREEN}Start boot sequence${NC}"
> > > +	for i in /env/boot.d/*; do
> > > +		readlink -f $i s
> > > +		basename $s link
> > > +		basename $i s
> > > +		msg="${GREEN}boot${NC} ${YELLOW}${s}${NC} -> ${CYAN}${link}${NC}"
> > > +		echo -e "${msg}"
> > > +		boot $dryrun $s
> > > +		echo -e "${msg} ${RED}failled${NC}"
> > > +		ret=$?
> > > +	done
> > > +	echo -e "${GREEN}boot sequence ${RED}failled${NC}"
> > 
> > s/failled/failed/
> > 
> > > +	exit $ret
> > > +fi
> > > +
> > >  if [ -n "$scr" ]; then
> > > -	if [ ! -f /env/boot/$scr ]; then
> > > -		echo -e "/env/boot/$scr does not exist.Valid choices:\n$sources"
> > > +	if [ ! -f /env/boot.d/$scr -a ! -f /env/boot/$scr ]; then

This check does not work as expected, probably a bug in the test
command.

Check out this:


#!/bin/sh

verbose=
dryrun=

usage="
$0 [OPTIONS] [source]\n
 -v  verbose\n
 -d  dryrun\n
 -l  list boot sources\n
 -h  help"

. /env/data/ansi-colors

for i in /env/boot/*; do
	basename $i s
	sources="$sources$s "
done

if [ -d /env/boot.d ]; then
	sources="$sources\n\nboot sequence:"
	for i in /env/boot.d/*; do
		readlink -f $i s
		basename $s link
		basename $i s
		sources="$sources\n ${YELLOW}${s}${NC} -> ${CYAN}${link}${NC}"
	done
	sequence=y
else
	sources="$sources\n\nboot sequence:\nnone"
	echo -e "${RED}WARNING: boot sequence: none${NC}"
	sequence=n
fi

while getopt "vdhl" opt; do
	if [ ${opt} = v ]; then
		if [ -n "$verbose" ]; then
			verbose="-v -v"
		else
			verbose="-v"
		fi
	elif [ ${opt} = d ]; then
		dryrun="-d"
	elif [ ${opt} = l ]; then
		echo -e "boot sources:\n$sources"
		exit 0
	elif [ ${opt} = h ]; then
		echo -e "$usage"
		exit 0
	fi
done

# clear linux.bootargs.dyn.* and bootm.*
global -r linux.bootargs.dyn.
global -r bootm.

if [ $# != 0 ]; then
	sequence=n
fi

if [ "$sequence" = y ]; then
	if [ ! -d /env/boot.d ]; then
		echo -e "${GREEN}boot sequence ${RED}none${NC}"
		exit 1
	fi
	echo -e "${GREEN}Start boot sequence${NC}"
	for i in /env/boot.d/*; do
		readlink -f $i s
		basename $s link
		basename $i s
		msg="${GREEN}boot${NC} ${YELLOW}${s}${NC} -> ${CYAN}${link}${NC}"
		echo -e "${msg}"
		boot $dryrun $s
		echo -e "${msg} ${RED}failled${NC}"
		ret=$?
	done
	echo -e "${GREEN}boot sequence ${RED}failed${NC}"
	exit $ret
else
	file=$1
	scr=
	echo -e "${GREEN}booting ${YELLOW}$file${NC}"
	[ -f /env/boot.d/$file ] && scr=/env/boot.d/$file
	[ -f /env/boot/$file ] && scr=/env/boot/$file

	if [ -z "$scr" ]; then
		echo -e "/env/boot/$file or /env/boot.d/$file does not exist. Valid choices:\n$sources"
		exit
	fi
	/env/boot/$scr
fi

if [ -n "$dryrun" ]; then
	exit 0
fi

bootm $verbose

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |