Remove various references to sysinstall from the system.

Reported-by: Robert Gauthier <rg0@sympatico.ca>

diff --git a/games/fortune/datfiles/dragonfly-tips b/games/fortune/datfiles/dragonfly-tips
index e355eea..7415507 100644 (file)
--- a/games/fortune/datfiles/dragonfly-tips
+++ b/games/fortune/datfiles/dragonfly-tips
@@ -1,6 +1,6 @@
 This fortune brought to you by:
 $FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.14.2.11 2003/03/15 08:48:29 dougb Exp $
-$DragonFly: src/games/fortune/datfiles/dragonfly-tips,v 1.2 2006/07/02 13:04:35 swildner Exp $
+$DragonFly: src/games/fortune/datfiles/dragonfly-tips,v 1.3 2007/11/19 18:49:06 swildner Exp $
 %
 Having trouble using fetch through a firewall? Try setting the environment
 variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
@@ -280,8 +280,7 @@ to TCP or UDP connections, but also for proxying them. See inetd(8) for
 details.
 %
 If other operating systems have damaged your Master Boot Record, you can
-reinstall it either with /stand/sysinstall or with boot0cfg(8). See
-"man boot0cfg" for details.
+reinstall it with boot0cfg(8). See "man boot0cfg" for details.
 %
 Need to see the calendar for this month? Simply type "cal".  To see the
 whole year, type "cal -y".

diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index f31d399..f9201d1 100644 (file)
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sys/boot/common/loader.8,v 1.57 2003/06/29 20:57:55 brueffer Exp $
-.\" $DragonFly: src/sys/boot/common/loader.8,v 1.15 2007/05/17 08:19:02 swildner Exp $
+.\" $DragonFly: src/sys/boot/common/loader.8,v 1.16 2007/11/19 18:49:06 swildner Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
@@ -360,7 +360,7 @@ Sets the list of binaries which the kernel will try to run as the initial
 process.
 The first matching binary is used.
 The default list is
-.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall .
+.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak .
 .It Va interpret
 Has the value
 .Dq Li ok

diff --git a/sys/boot/forth/loader-bootp.conf b/sys/boot/forth/loader-bootp.conf
index 0fa69f1..879c1ef 100644 (file)
--- a/sys/boot/forth/loader-bootp.conf
+++ b/sys/boot/forth/loader-bootp.conf
@@ -7,7 +7,7 @@
 # All arguments must be in double quotes.
 #
 # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $
-# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.16 2007/11/03 17:43:39 swildner Exp $
+# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.17 2007/11/19 18:49:06 swildner Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -68,7 +68,7 @@ module_path="/;/boot;/modules"        # Set the module search path
 #boot_single=""                # Start system in single-user mode
 #boot_userconfig=""    # Run kernel's interactive device configuration program
 #boot_verbose=""       # Causes extra debugging information to be printed
-#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall"
+#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak"
                        # Sets the list of init candidates
 #dumpdev="ad0s1b"      # Set device for crash dumps
 

diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 0ea67ea..833ddf3 100644 (file)
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -7,7 +7,7 @@
 # All arguments must be in double quotes.
 #
 # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $
-# $DragonFly: src/sys/boot/forth/loader.conf,v 1.23 2007/11/03 17:43:39 swildner Exp $
+# $DragonFly: src/sys/boot/forth/loader.conf,v 1.24 2007/11/19 18:49:06 swildner Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -68,7 +68,7 @@ module_path="/;/boot;/modules"        # Set the module search path
 #boot_single=""                # Start system in single-user mode
 #boot_userconfig=""    # Run kernel's interactive device configuration program
 #boot_verbose=""       # Causes extra debugging information to be printed
-#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall"
+#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak"
                        # Sets the list of init candidates
 #dumpdev="ad0s1b"      # Set device for crash dumps
 

diff --git a/sys/config/LINT b/sys/config/LINT
index 42ccb8a..0e71ac0 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -3,7 +3,7 @@
 #      as much of the source tree as it can.
 #
 # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $
-# $DragonFly: src/sys/config/LINT,v 1.140 2007/11/10 19:02:04 swildner Exp $
+# $DragonFly: src/sys/config/LINT,v 1.141 2007/11/19 18:49:06 swildner Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -2669,7 +2669,7 @@ options   DRM_LINUX
 # Embedded system options:
 #
 # An embedded system might want to run something other than init.
-options        INIT_PATH="/sbin/init:/stand/sysinstall"
+options        INIT_PATH="/sbin/init:/sbin/oinit"
 
 # Debug options
 options        BUS_DEBUG       # enable newbus debugging

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 133239d..6d5352f 100644 (file)
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -40,7 +40,7 @@
  *
  *     @(#)init_main.c 8.9 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/init_main.c,v 1.134.2.8 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/kern/init_main.c,v 1.82 2007/08/15 03:15:06 dillon Exp $
+ * $DragonFly: src/sys/kern/init_main.c,v 1.83 2007/11/19 18:49:06 swildner Exp $
  */
 
 #include "opt_init_path.h"
@@ -470,7 +470,7 @@ static char init_path[MAXPATHLEN] =
 #ifdef INIT_PATH
     __XSTRING(INIT_PATH);
 #else
-    "/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall";
+    "/sbin/init:/sbin/oinit:/sbin/init.bak";
 #endif
 SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0, "");
 

diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index c1159f3..2a7c586 100644 (file)
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_linker.c,v 1.41.2.3 2001/11/21 17:50:35 luigi Exp $
- * $DragonFly: src/sys/kern/kern_linker.c,v 1.38 2007/06/07 22:58:11 corecode Exp $
+ * $DragonFly: src/sys/kern/kern_linker.c,v 1.39 2007/11/19 18:49:06 swildner Exp $
  */
 
 #include "opt_ddb.h"
@@ -298,9 +298,8 @@ linker_load_file(const char* filename, linker_file_t* result)
             * Format not recognized or otherwise unloadable.
             * When loading a module that is statically built into
             * the kernel EEXIST percolates back up as the return
-            * value.  Preserve this so that apps like sysinstall
-            * can recognize this special case and not post bogus
-            * dialog messages.
+            * value.  Preserve this so that apps can recognize this
+            * special case.
             */
            if (error != EEXIST)
                    error = ENOEXEC;