git: 9front

Info  •  Files  •  Log  •  Branches

inst: remove fdisk/prep stuff from mainloop, remove inst/startwin

--- a/rc/bin/inst/mainloop

+++ b/rc/bin/inst/mainloop

@@ -1,19 +1,10 @@

 #!/bin/rc

-sleep 86400 &

 cd /bin/inst

 . defs

 fn sigint { }

 coherence

-

-disks=`{ls /dev/sd*/data >[2]/dev/null | sed 's!/dev/(sd..)/data!\1!'}

-for (i in /dev/sd*/data)

-	if(test -f $i)

-		disk/fdisk -p $i>`{basename -d $i}^/ctl >[2]/dev/null

-for(i in /dev/sd*/plan9*)

-	if(test -f $i)

-		disk/prep -p $i >`{basename -d $i}^/ctl >[2]/dev/null

 # we run this while() here so that ctl-d won''t exit from us -- it''ll only exit main!

 # main contains a while() loop too, to avoid the hit of 

--- a/rc/bin/inst/startwin

+++ /dev/null

@@ -1,45 +1,0 @@

-#!/bin/rc

-

-fn time { date | sed 's/.........$//'}

-

-rm -f /srv/log

-

-if(~ $#* 2) {

-	wid=$1

-	ht=$2

-} 

-if not {

-	scr=(`{cat /dev/draw/new >[2]/dev/null || status=''})

-	wid=$scr(7)

-	ht=$scr(8)

-}

-

-if(test $ht -gt 800)

-	ht=800

-

-if(test $wid -gt 800)

-	wid=800

-

-statwid=`{hoc -e $wid^'*.2'}

-if(test $statwid -lt 180)

-	statwid=180

-if(test $statwid -gt 300)

-	statwid=300

-

-logwid=`{hoc -e $wid^-$statwid}

-if(test $logwid -gt 1000)

-	logwid=1000

-

-loght=`{hoc -e $ht^'*.25'}

-if(test $loght -lt 130)

-	loght=130

-

-textht=`{hoc -e $ht^-$loght}

-

-window 0,$textht,$statwid,$ht stats -lmisce

-window 0,0,^`{hoc -e $logwid+$statwid}^,$textht inst/mainloop

-rm -f /srv/log

-window $statwid,$textht,^`{hoc -e $logwid+$statwid}^,$ht 'echo 2 >/srv/log; while(){sleep 1000}'

-while(! test -f /srv/log)

-	sleep 1

-log `{time} Installation process started

-- 

⑨