Sat Dec 12 05:23:21 2020 UTC ()

Fetch files via ftp using auto-fetching with URL per each binary set.

On slower machines, it takes more than five minutes to get a large
set binary and it could cause timeout of ftp control session, so
getting multiple binary sets in a single ftp session always fails.

Briefly tested on HP 9000/425e with 9.1 tree and ftp.netbsd.org binaries.
No particular comments on tech-install@ and port-hp300@.

Maybe should be pulled up to netbsd-9.


(tsutsui)

diff -r1.58 -r1.59 src/distrib/miniroot/install.sub

--- src/distrib/miniroot/install.sub 2020/12/05 18:57:21	1.58
+++ src/distrib/miniroot/install.sub 2020/12/12 05:23:21	1.59

 @@ -1,15 +1,15 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.58 2020/12/05 18:57:21 tsutsui Exp $
+#	$NetBSD: install.sub,v 1.59 2020/12/12 05:23:21 tsutsui Exp $
+#
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Jason R. Thorpe.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -715,71 +715,85 @@ __install_ftp_2
 		# contents, and use that to determine the files to get.
 		cat /tmp/ftp-script.sh	>  /tmp/ftp-dir.sh
 		echo "nlist"		>> /tmp/ftp-dir.sh
 		echo "quit"		>> /tmp/ftp-dir.sh
 		echo "__end_commands"	>> /tmp/ftp-dir.sh
 		if [ $resp = '?' ]; then
 			sh /tmp/ftp-dir.sh
 		else
 			_sets=$(sh /tmp/ftp-dir.sh | sort -u | sh /tmp/fname_filter.sh)
 		fi
 	done
 	rm -f /tmp/ftp-dir.sh /tmp/fname_filter.sh
 	rm -f /tmp/ftp-script.sh
 	# Prepare ftp-fetch script to fetch binary sets
 	_download_dir=INSTALL
 	_ftp_opts=""
 	_ftp_url="ftp://$_ftp_server_login:$_ftp_server_password@$_ftp_server_ip$_ftp_server_dir/"
 	echo "#!/bin/sh" > /tmp/ftp-fetch.sh
 	echo "cd /mnt" >> /tmp/ftp-fetch.sh
 	echo "mkdir -p $_download_dir" >> /tmp/ftp-fetch.sh
 	while : ; do
 		echo "The following sets are available for extraction:"
 		echo "(marked sets are already on the extraction list)"
 		echo ""
 		_next=""
 		for _f in $_sets ; do
 			if isin $_f $_setsdone; then
 				echo -n "[X] "
 				_next=""
 			else
 				echo -n "    "
 				if [ -z "$_next" ]; then _next=$_f; fi
 			fi
 			echo $_f
 		done
 		echo ""
 		# Get name of the file and add extraction command
-		# to the ftp-script.
+		# to the ftp-fetch script.
 		if [ -z "$_next" ]; then resp=n; else resp=y; fi
 		echo -n "Continue to add filenames [$resp]? "
 		getresp "$resp"
 		if [ "$resp" = "n" ]; then
 			break
 		fi
 		echo -n "File name [$_next]? "
 		getresp "$_next"
 		if isin $resp $_sets; then
-			echo "get $resp |\"pax -zr${verbose_flag}pe\"" >> \
+			echo "echo Fetching $resp:" >> \
-					/tmp/ftp-script.sh
+					/tmp/ftp-fetch.sh
 			echo "ftp ${_ftp_opts} -o $_download_dir/$resp ${_ftp_url}$resp" >> \
 					/tmp/ftp-fetch.sh
 			echo "echo Extracting $resp:" >> \
 					/tmp/ftp-fetch.sh
 			echo "pax -zr${verbose_flag}pe -f $_download_dir/$resp" >> \
 					/tmp/ftp-fetch.sh
 			echo "rm -f $_download_dir/$resp" >> \
 					/tmp/ftp-fetch.sh
 			_setsdone="$resp $_setsdone"
 		else
 			echo "You entered an invalid filename."
 			echo ""
 		fi
 	done
-	echo "quit" >> /tmp/ftp-script.sh
+	sh /tmp/ftp-fetch.sh
-	echo "__end_commands" >> /tmp/ftp-script.sh
+	rm -f /tmp/ftp-fetch.sh
 	sh /tmp/ftp-script.sh
 	rm -f /tmp/ftp-script.sh
 	echo "Extraction complete."
+}
 install_from_mounted_fs() {
 	# $1 - directory containing installation sets
 	local _filename
 	local _sets
 	local _next
 	local _all
 	local _f
 	local _dirname
 	_dirname=$1