diff --git a/rc/bin/inst/bootsetup b/rc/bin/inst/bootsetup index 7de697850..e33313f3a 100755 --- a/rc/bin/inst/bootsetup +++ b/rc/bin/inst/bootsetup @@ -30,7 +30,7 @@ case go echo 'monitor='^$monitor echo 'vgasize='^$vgasize if(test -f '#ec/*nomp') - echo '*nomp=' + echo '*nomp=1' } >/tmp/plan9.ini } diff --git a/rc/bin/inst/finish b/rc/bin/inst/finish index e616e64e1..7a0abfe1a 100755 --- a/rc/bin/inst/finish +++ b/rc/bin/inst/finish @@ -10,10 +10,7 @@ case checkdone export finish case go - if(~ $cdboot yes){ - echo 'Congratulations; you''ve completed the install.' - echo - halt - } - stop go finished + echo 'Congratulations; you''ve completed the install.' + echo + halt } diff --git a/rc/bin/inst/stop b/rc/bin/inst/stop index a1d48694f..f7d1d1734 100755 --- a/rc/bin/inst/stop +++ b/rc/bin/inst/stop @@ -14,37 +14,4 @@ case checkready stop=notdone export stop } - -case go - coherence - switch($2){ - case finished - echo 'We need to write the state of the current installation to the install floppy,' - echo 'so that you can pick up from here if, for example, you want to set up' - echo 'more boot methods.' - echo - case * - echo 'We need to write the state of the current installation to the install floppy.' - echo 'so that you can pick up from here when you wish to continue.' - echo - } - echo -n 'Please make sure the install floppy is in the floppy drive and press enter.' - read >/dev/null >[2]/dev/null - - if(! a:) { - echo 'Couldn''t mount the floppy disk; sorry.' - exit - } - - if(cp /tmp/vars /n/a:/9inst.cnf || cp /tmp/vars /n/a:/9inst.cnf) { - echo 'Your install state has been saved to the install floppy.' - if(~ $2 finished){ - echo - echo 'Congratulations; you''ve completed the install.' - } - echo - halt - } - - echo 'Couldn''t save the state to your install floppy. Sorry.' }