Made setup.sh more CD-aware (understand that the system looks like an

installed system already, but isn't).

Install sed in /bin too, so /etc/rc can use it for some /usr magic before
/usr is mounted.

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index ed244fb4314751810848a184c11bbda1e2d070a4..d0eef9f4b5cde147b4916657e322143749fda28c 100755 (executable)
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -112,20 +112,25 @@ case $thisroot:$fdusr in
 /dev/fd*:/dev/fd*)     fdroot=$thisroot        # ROOT is mounted directly
                        ;;
 *)                     fdroot=$thisroot        # ?
-    echo -n "\
+    if [ -f /CD ]
+    then
+       :
+    else
+           echo -n "\
 It looks like Minix has been installed on disk already.  Are you sure you
 know what you are doing? [n] "
-    read yn
-    case "$yn" in
-    [yY]*|sure)        ;;
-    *) exit
-    esac
+           read yn
+           case "$yn" in
+           [yY]*|sure) ;;
+           *)  exit
+           esac
+     fi
 esac
 
 echo -n "\
 This is the Minix installation script.
 
-Note 1: If the screen blanks suddenly then hit F3 to select \"software
+Note 1: If the screen blanks suddenly then hit control+F3 to select \"software
        scrolling\".
 
 Note 2: If things go wrong then hit DEL and start over.
@@ -326,6 +331,8 @@ else
     cpdir -f /dev /mnt/dev             # Copy any extra MAKEDEV'd devices
 fi
 
+# CD remnants that aren't for the installed system
+rm /mnt/etc/issue /mnt/CD 2>/dev/null
                                        # Change /etc/fstab.
 echo >/mnt/etc/fstab "\
 # Poor man's File System Table.

diff --git a/commands/simple/Makefile b/commands/simple/Makefile
index ea146f26054904ed24f1eb150aebcb2bc4b89571..f00053a72aed3a29ea53592af061eeff402dd7fd 100755 (executable)
--- a/commands/simple/Makefile
+++ b/commands/simple/Makefile
@@ -942,6 +942,7 @@ install:    \
        /usr/bin/rmdir \
        /usr/bin/rsh \
        /usr/bin/sed \
+       /bin/sed \
        /usr/bin/shar \
        /usr/bin/size \
        /usr/bin/sleep \
@@ -1362,6 +1363,9 @@ install:  \
 /usr/bin/sed:  sed
        install -cs -o bin $? $@
 
+/bin/sed:      sed
+       install -cs -o bin $? $@
+
 /usr/bin/shar: shar
        install -cs -o bin $? $@