shithub: riscv

Download patch

ref: 86e3e0791c239bbaaece242cf78fa56794b58a72
parent: 9ebd6f860e9d551e8b1c8f0a0c62bb4c1aa2c268
author: Jacob Moody <[email protected]>
date: Sat Apr 27 20:20:45 EDT 2024

inst: remove net install support

--- a/rc/bin/inst/configdist
+++ /dev/null
@@ -1,22 +1,0 @@
-#!/bin/rc
-
-# prereq: mountfs
-# desc: choose the source of the distribution archive
-
-switch($1){
-case checkdone
-	if(! ~ $distisfrom net local){
-		configdist=ready
-		export configdist
-	}
-
-case go
-	echo 'Are you going to download the distribution'
-	echo 'from the internet or do you have it on local media?'
-	echo
-	prompt -d local 'Distribution is from' local net
-	distisfrom=$rd
-	export distisfrom
-}
-
-
--- a/rc/bin/inst/download
+++ /dev/null
@@ -1,40 +1,0 @@
-#!/bin/rc
-
-# prereq: mountfs
-# desc: download or continue to download the distribution archives
-
-switch($1) {
-case checkready
-	devs=(`{cat /net/ipifc/*/status >[2]/dev/null |
-		grep -v '127\.0\.0\.1' |
-		sed 's/ .*//'})
-	if(~ $#devs 0) {
-		download=notdone
-		export download
-	}
-	if(~ $mountdist done){
-		download=notdone
-		export download
-	}
-
-case go
-	default=()
-	if(~ $#installurl 1)
-		default=(-d $installurl)
-	prompt $default 'Installation url'
-	installurl=$rd
-
-	if(! test -e /mnt/web/ctl)
-		webfs
-
-	srvmedia=(ip/httpfile -s httpdist $installurl/9front.iso)
-	mountmedia=(mount /srv/httpdist /n/distmedia)
-	distmediadir=/
-	export srvmedia mountmedia distmediadir
-	
-case checkdone
-	if(! test -f /n/distmedia/9front.iso) {
-		download=notdone
-		export download
-	}
-}
--- a/rc/bin/inst/main
+++ b/rc/bin/inst/main
@@ -15,10 +15,8 @@
 	configfs\
 	partdisk prepdisk\
 	mountfs\
-	configdist\
 	confignet\
 	mountdist\
-	download\
 	copydist\
 	ndbsetup\
 	tzsetup\
--- a/rc/bin/inst/mountdist
+++ b/rc/bin/inst/mountdist
@@ -1,6 +1,6 @@
 #!/bin/rc
 
-# prereq: mountfs configdist
+# prereq: mountfs
 # desc: locate and mount the distribution
 
 fn domount{
@@ -16,43 +16,11 @@
 }
 
 fn havedist {
-	test -d $1/dist/plan9front || test -f $1/9front.iso || test -f $1/9front.iso.bz2
+	test -d $1/dist/plan9front
 }
 
-fn trycdimage{
-	if(test -f $1){
-		rm -f /srv/9660.dist
-		unmount /n/dist >[2]/dev/null
-		9660srv 9660.dist >[2]/dev/null
-		logprog mount /srv/9660.dist /n/dist $1
-		exitifdone
-		mountdist=notdone
-		export mountdist
-		exit notdone
-	}
-}
-
-fn trycdimagebz2 {
-	if(test -f $1){
-		mkdir -p /n/newfs/dist
-		echo -n 'bunzip2 < '^$1^' >/n/newfs/dist/9front.iso'
-		bunzip2 < $1 >/n/newfs/dist/_9front.iso &&
-		mv /n/newfs/dist/_9front.iso /n/newfs/dist/9front.iso
-		echo
-		trycdimage /n/newfs/dist/9front.iso
-		mountdist=notdone
-		export mountdist
-		exit notdone
-	}
-}
-
-
 switch($1){
 case checkready
-	if(! ~ $distisfrom local && ! ~ $download done){
-		mountdist=notdone
-		export mountdist
-	}
 	if(! ~ $#mountmedia 0 1){
 		if(domount){
 			mountdist=done
@@ -135,10 +103,6 @@
 		if(~ $first yes){
 			echo
 			echo Which directory contains the distribution?
-			echo 'Any of the following will suffice (in order of preference):'
-			echo '	- the root directory of the cd image'
-			echo '	- the directory containing 9front.iso'
-			echo '	- the directory containing 9front.iso.bz2'
 			echo
 			first=no
 		}
@@ -177,12 +141,6 @@
 		export mountdist
 		exit notdone
 	}
-
-	trycdimage /n/distmedia/$distmediadir/9front.iso
-	trycdimage /n/newfs/dist/9front.iso
-
-	trycdimagebz2 /n/distmedia/$distmediadir/9front.iso.bz2
-	trycdimagebz2 /n/newfs/dist/9front.iso.bz2
 
 	mountdist=notdone
 	export mountdist