reduce the drift in rc scripts. bring P and C up-to-date. Reference: /n/atom/patch/applied2013/binrcsync Date: Sun Jun 23 17:13:55 CES 2013 Signed-off-by: quanstro@quanstro.net --- /rc/bin/0l Sun Jun 23 17:13:08 2013 +++ /rc/bin/0l Sun Jun 23 17:13:08 2013 @@ -1,2 +1,2 @@ #!/bin/rc -exec vl -L $* +exec vl -S $* --- /rc/bin/C Sun Jun 23 17:13:08 2013 +++ /rc/bin/C Sun Jun 23 17:13:08 2013 @@ -21,19 +21,10 @@ if not rfork en -server=() -for(i in /lib/ndb/consoledb.*){ - dev=`{ndb/query -f $i console $1 dev} - if(! ~ $#dev 0){ - server=` '.' {echo -n $i} - server=$server(2) - break - } -} - +server=`{consoleof $1 >[2]/dev/null} if(~ $#server 0){ - echo C: unknown console server for $1 - exit 1 + echo C: unknown console server for $1 >[2=1] + exit noconsole } if(! test -e /mnt/consoles/$1){ --- /rc/bin/P Sun Jun 23 17:13:08 2013 +++ /rc/bin/P Sun Jun 23 17:13:08 2013 @@ -1,5 +1,4 @@ #!/bin/rc -rfork en flagfmt='' args='sys ...' @@ -38,7 +37,17 @@ } | telnet $1 >/dev/null >[2=1] } -types=(wti iopower apc) +fn apcc { + { + echo + echo apc # user + echo apc # password + echo olReboot $2 + sleep 1 + } | C $1 >/dev/null +} + +types=(wti iopower apc apcc) fn P{ server=() --- /rc/bin/apc/genpwrdb Sun Jun 23 17:13:08 2013 +++ /rc/bin/apc/genpwrdb Sun Jun 23 17:13:08 2013 @@ -8,6 +8,6 @@ sleep 3 } | telnet -r $1 >[2=] | { echo 'type=apc' - sed -n 's/[ 12][0-9]: (.*)/ console=\1/p' | + sed -n 's/[ 12][0-9]: (.*)/ power=\1/p' | sed 's/Outlet /' ^ $1 ^ './g' } --- /rc/bin/apc/login Thu Jan 1 00:00:00 1970 +++ /rc/bin/apc/login Sun Jun 23 17:13:08 2013 @@ -0,0 +1,4 @@ +#!/bin/rc +sleep 0.3 +echo apc +echo apc --- /rc/bin/apc/putpwrdb Thu Jan 1 00:00:00 1970 +++ /rc/bin/apc/putpwrdb Sun Jun 23 17:13:08 2013 @@ -0,0 +1,34 @@ +#!/bin/rc +rfork en + +fn gen{ + host=$1; shift + c=(1) + { + sleep 0.3; echo apc + sleep 0.3; echo apc + sleep 0.3; + sleep 3 + for(i){ + echo olname $#c $i + sleep 1 + c=($c 1) + } + } | telnet -r $host |cat #>[2=] +} + +fn fatal{ + echo >[1=2] $* + exit fatal +} + +nl=' +' +for(i){ + if(! ~ $i . .. ./* ../* /*) + f=/lib/ndb/powerdb.$i + if(! test -f $f) + fatal powerdb not found + list = `$nl {sed -n 's/ power=(.*)/\1/p' < $f} + gen `{echo $f | sed 's/.*\.//g'} $list +} --- /rc/bin/dmaon Sun Jun 23 17:13:08 2013 +++ /rc/bin/dmaon Sun Jun 23 17:13:08 2013 @@ -3,7 +3,7 @@ rfork e if(! test -f '#S/sdctl') exit '' -ctlrs=`{sed -n 's/(^sd.) ata .*/\1/p' <'#S/sdctl'} +ctlrs=`{sed -n 's/(^sd.) (ata|ide) .*/\1/p' <'#S/sdctl'} if(~ $#ctlrs 0) exit '' for(ctl in '#S/'$ctlrs^?/ctl)