spaces

3 files changed, 27 insertions, 27 deletions

diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index cac28853bd6..39a0bd6ab2e 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.122 2002/11/28 01:54:58 krw Exp $
+#	$OpenBSD: install.sh,v 1.123 2002/11/28 03:06:30 deraadt Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -141,14 +141,14 @@ if [ ! -f /etc/fstab ]; then
 					[[ -f $FILESYSTEMS && -n $(grep " $_mp\$" $FILESYSTEMS) ]] && break
 					isin $_mp ${_mount_points[*]} && break
 					# Ignore '/' for any partition but ROOTDEV. Check just
-					# in case ROOTDEV isn't first partition processed. 
-					[[ $_mp == '/' ]] && break					
+					# in case ROOTDEV isn't first partition processed.
+					[[ $_mp == '/' ]] && break
 					# Otherwise, record user specified mount point.
 					_mount_points[$_i]=$_mp
 				done < /tmp/fstab.$DISK
 			fi
 			: $(( _i += 1 ))
- 		done
+		done
 
 		if [[ $DISK == $ROOTDISK ]]; then
 			# Ensure that ROOTDEV was configured.
@@ -170,7 +170,7 @@ if [ ! -f /etc/fstab ]; then
 
 		# If there are no BSD partitions, or $DISK has been reset, go on to next disk.
 		[[ ${#_partitions[*]} > 0 && -n $DISK ]] || continue
-		
+
 		# Now prompt the user for the mount points. Loop until "done" entered.
 		_i=0
 		while : ; do
@@ -192,9 +192,9 @@ if [ ! -f /etc/fstab ]; then
 					# been specified on this one?
 					_j=0
 					for _pp in ${_partitions[*]} ""; do
-						if [ $_i -ne $_j ]; then	
+						if [ $_i -ne $_j ]; then
 							[ "$resp" = "${_mount_points[$_j]}" ] && break
-						fi	
+						fi
 						: $(( _j += 1 ))
 					done
 				fi
@@ -355,7 +355,7 @@ install_sets
 # Set machdep.apertureallowed if required. install_sets must be
 # done first so that /etc/sysctl.conf is available.
 set_machdep_apertureallowed
-	
+
 # Copy configuration files to /mnt/etc.
 cfgfiles="fstab hostname.* mygate resolv.conf kbdtype sysctl.conf"
 
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 6ed33a8dae4..5c5c6dd33ba 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.276 2002/11/28 01:54:58 krw Exp $
+#	$OpenBSD: install.sub,v 1.277 2002/11/28 03:06:30 deraadt Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -113,7 +113,7 @@ __EOT
 
 	cat << __EOT
 
-IS YOUR DATA BACKED UP? As with anything that modifies disk contents, this 
+IS YOUR DATA BACKED UP? As with anything that modifies disk contents, this
 program can cause SIGNIFICANT data loss.
 
 __EOT
@@ -874,10 +874,10 @@ install_get_files () {
 	[[ -n $GET_FILES ]] || return
 
 	ask "Ready to ${MODE} sets?" y
-	case $resp in 
+	case $resp in
 	n*|N*)	return ;;
 	esac
-	
+
 	echo
 	for _f in $THESETS ; do
 		isin $_f $GET_FILES || continue
@@ -910,7 +910,7 @@ encode_for_url() {
 }
 
 # Check for the presence of an error message in the output of the ftp commands
-# used to get the list of files in a directory. 
+# used to get the list of files in a directory.
 #
 # $1 = error message to look for
 # $2 = ftp command output
@@ -967,7 +967,7 @@ install_url() {
 			eval ask \"Server IP address, or hostname?\" \"\$_${_url_type}_server_ip\"
 			continue;
 		fi
-	
+
 		eval ask \"Server IP address, hostname, or list#?\" \"\$_${_url_type}_server_ip\"
 
 		case $resp in
@@ -980,7 +980,7 @@ install_url() {
 
 			if [ $maxlines -lt $resp -o $resp -lt 1 ]; then
 				echo "There is no ${resp}th line in the list."
-			else	
+			else
 				tline=`grep "^${_url_type}:" /tmp/ftplist | sed -ne "${resp}p"`
 				url=`echo $tline | sed -e "s/^${_url_type}:\/\///" |
 					cutword -t' ' 1 | cutword -t' ' 1`
@@ -1077,7 +1077,7 @@ install_url() {
 # $2 - default directory
 install_mounted_fs() {
 	local _mp=$1 _dir=$2
-	
+
 	while : ; do
 		ask "Pathname to the sets? (or 'done')" "$_dir"
 		case $resp in
@@ -1494,7 +1494,7 @@ __EOT
 # user selects from that location. Repeat as many times as the user
 # needs to get all desired sets.
 install_sets() {
- 	cat << __EOT
+	cat << __EOT
 
 You will now specify the location and names of the ${MODE} sets you want to
 load. You will be able to repeat this step until all of your sets have been
@@ -1553,7 +1553,7 @@ munge_fstab() {
 		# and success is not guaranteed. The user
 		# will have to mount nfs filesystems manually.
 		[ "$_fstype" != "nfs" ] || continue
-		
+
 		# Remove any softdep options, as soft updates are not
 		# available in the ramdisk kernels.
 		_opt="$(echo ${_opt} | \
@@ -1571,7 +1571,7 @@ munge_fstab() {
 		echo $_dev /mnt$_mp $_fstype $_opt $_rest
 
 	done < /tmp/fstab > /etc/fstab
-	
+
 	# If no /etc/fstab was created, we have nowhere to ${MODE} to.
 	if [ ! -s /etc/fstab ]; then
 		echo "Unable to create valid /etc/fstab."
@@ -1856,7 +1856,7 @@ finish_up() {
 
 	[ -x /mnt/${MODE}.site ] && /mnt/usr/sbin/chroot /mnt /${MODE}.site
 
-	# Disable trap(s) that do cleanup on exit. With success comes a 
+	# Disable trap(s) that do cleanup on exit. With success comes a
 	# reboot which washes away all sins.
 	trap - HUP INT QUIT TERM EXIT
 
@@ -1905,10 +1905,10 @@ DEVSMADE=
 THESETS="bsd $MDSETS"
 DEFAULTSETS="bsd"
 for _set in base etc misc comp man game xbase xshare xfont xserv site ; do
-       [[ $MODE == upgrade && $_set == etc ]] && continue
-       THESETS="$THESETS ${_set}${VERSION}.tgz"
-       isin $_set xbase xshare xfont xserv site && continue
-       DEFAULTSETS="$DEFAULTSETS ${_set}${VERSION}.tgz"
+	[[ $MODE == upgrade && $_set == etc ]] && continue
+	THESETS="$THESETS ${_set}${VERSION}.tgz"
+	isin $_set xbase xshare xfont xserv site && continue
+	DEFAULTSETS="$DEFAULTSETS ${_set}${VERSION}.tgz"
 done
 
 # Global variable using during sets installation
@@ -1935,5 +1935,5 @@ trap 'exit 2' HUP INT QUIT TERM
 # Introduce ourselves.
 welcome
 
-# Get ROOTDISK and default ROOTDEV 
+# Get ROOTDISK and default ROOTDEV
 get_rootdisk
diff --git a/distrib/miniroot/list2sh.awk b/distrib/miniroot/list2sh.awk
index d2f9e1f7358..858bbe035ba 100644
--- a/distrib/miniroot/list2sh.awk
+++ b/distrib/miniroot/list2sh.awk
@@ -1,4 +1,4 @@
-#	$OpenBSD: list2sh.awk,v 1.11 2002/08/29 01:53:37 krw Exp $
+#	$OpenBSD: list2sh.awk,v 1.12 2002/11/28 03:06:30 deraadt Exp $
 #	$NetBSD: list2sh.awk,v 1.2 1996/05/04 15:45:31 pk Exp $
 
 BEGIN {
@@ -19,7 +19,7 @@ $1 == "REMOVE" {
 	printf("echo '%s'\n", $0);
 	printf("rm -f ${TARGDIR}/%s\n", $2);
 	next;
-}	
+}
 $1 == "STRIP" {
 	printf("echo '%s'\n", $0);
 	printf("test -f ${TARGDIR}/%s && rm -fr ${TARGDIR}/%s\n", $3, $3);