From c910640fdd12b3a4c78cb56717e6018a25139b86 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 21 May 2012 03:51:38 +0200 Subject: [PATCH] inst: remove fdisk/prep stuff from mainloop, remove inst/startwin --- rc/bin/inst/mainloop | 9 --------- rc/bin/inst/startwin | 45 -------------------------------------------- 2 files changed, 54 deletions(-) delete mode 100755 rc/bin/inst/startwin diff --git a/rc/bin/inst/mainloop b/rc/bin/inst/mainloop index 94d58efc4..f57c37098 100755 --- a/rc/bin/inst/mainloop +++ b/rc/bin/inst/mainloop @@ -1,20 +1,11 @@ #!/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 # continually reexecing from here. diff --git a/rc/bin/inst/startwin b/rc/bin/inst/startwin deleted file mode 100755 index 9da63bbee..000000000 --- a/rc/bin/inst/startwin +++ /dev/null @@ -1,45 +0,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