ref: c43ef9220248cddaf9a47e520996d212fad9c983
parent: 43f2d5e7e0b8ca8d24e15fb4ff566827e5a5ae5b
author: stanley lieber <stanley.lieber@gmail.com>
date: Mon May 9 18:56:02 EDT 2011
installer: fix *nomp=1, remove floppy nonsense from stop.
--- a/rc/bin/inst/bootsetup
+++ b/rc/bin/inst/bootsetup
@@ -30,7 +30,7 @@
echo 'monitor='^$monitor
echo 'vgasize='^$vgasize
if(test -f '#ec/*nomp')
- echo '*nomp='
+ echo '*nomp=1'
} >/tmp/plan9.ini
}
--- a/rc/bin/inst/finish
+++ b/rc/bin/inst/finish
@@ -10,10 +10,7 @@
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
}
--- a/rc/bin/inst/stop
+++ b/rc/bin/inst/stop
@@ -14,37 +14,4 @@
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.'
}
--
⑨