From: Ben Gras <ben@minix3.org>
Date: Tue, 28 Mar 2006 12:32:14 +0000 (+0000)
Subject: Never disable inet (for X)
X-Git-Tag: v3.1.2a~112
X-Git-Url: http://zhaoyanbai.com/repos/dig.html?a=commitdiff_plain;h=f32289c86f6f49d8efca0be798fbb8f3516a6811;p=minix.git

Never disable inet (for X)
---

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index ea30f4dec..922f65ba6 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -574,14 +574,6 @@ fi
 					# Set inet.conf to correct driver
 if [ -n "$driver" ]
 then	echo "$driverargs" >$MYLOCALRC
-	disable=""
-else	disable="disable=inet;"
-fi
-					# Set inet.conf to correct driver
-if [ -n "$driver" ]
-then	echo "$driverargs" >$MYLOCALRC
-	disable=""
-else	disable="disable=inet;"
 fi
 
 umount /dev/$usr >/dev/null || exit		# Unmount the intended /usr.
@@ -614,9 +606,9 @@ mount /dev/$usr /mnt >/dev/null || exit
 # Make bootable.
 installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit
 
-edparams /dev/$root "rootdev=$root; ramimagedev=$root; $disable; minix(1,Start MINIX 3 (requires at least 16 MB RAM)) { label=BIG; boot; }; smallminix(2,Start Small MINIX 3 (intended for 8 MB RAM systems)) { label=SMALL; ramsize=0; boot; }; main() { echo By default, MINIX 3 will automatically load in 3 seconds.; echo Press ESC to enter the monitor for special configuration.; trap 3000 boot; menu; }; save" || exit
+edparams /dev/$root "rootdev=$root; ramimagedev=$root; minix(1,Start MINIX 3 (requires at least 16 MB RAM)) { label=BIG; boot; }; smallminix(2,Start Small MINIX 3 (intended for 8 MB RAM systems)) { label=SMALL; ramsize=0; boot; }; main() { echo By default, MINIX 3 will automatically load in 3 seconds.; echo Press ESC to enter the monitor for special configuration.; trap 3000 boot; menu; }; save" || exit
 pfile="/mnt/src/tools/fdbootparams"
-echo "rootdev=$root; ramimagedev=$root; $disable; save" >$pfile
+echo "rootdev=$root; ramimagedev=$root; save" >$pfile
 # Save name of CD drive
 cddrive="`mount | grep usr | awk '{ print $1 }' | sed 's/p.*//'`" 
 echo "cddrive=$cddrive" >>/mnt/etc/rc.package