diff options
| author | msmith <msmith@FreeBSD.org> | 1998-11-03 21:07:51 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1998-11-03 21:07:51 +0000 |
| commit | 90bdf0d597fa5bb05718667b6f2cc4f3119ccd4f (patch) | |
| tree | e84bbcd55ef56c2325c788429b24e7881cee88d8 /sys/amd64 | |
| parent | c3fb5f8be16f0416708a0f968b0584e5201512b4 (diff) | |
| download | FreeBSD-src-90bdf0d597fa5bb05718667b6f2cc4f3119ccd4f.zip FreeBSD-src-90bdf0d597fa5bb05718667b6f2cc4f3119ccd4f.tar.gz | |
Remove the USERCONFIG_BOOT option. Userconfig script data is searched
for in a loaded module of type "userconfig_script". The RB_CONFIG
flag will always result in the user being left inside userconfig at
the end of the script's execution, regardless of 'quit' commands in
the script. If the RB_CONFIG flag is not specified, the user will
never be left inside userconfig, even if the script does not have an
explicit exit command.
Add the INTRO_USERCONFIG option. This option forces the userconfig 'intro'
screen (after a script has optionally been executed). There is no longer
a need to queue an 'intro' command.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/locore.S | 11 | ||||
| -rw-r--r-- | sys/amd64/amd64/locore.s | 11 | ||||
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 11 |
3 files changed, 4 insertions, 29 deletions
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index f6f735d..688a5c2 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.115 1998/10/09 23:36:25 peter Exp $ + * $Id: locore.s,v 1.116 1998/10/10 13:37:16 kato Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -599,15 +599,6 @@ olddiskboot: movl 12(%ebp),%eax movl %eax,R(_bootdev) -#if defined(USERCONFIG_BOOT) && defined(USERCONFIG) - movl $0x10200, %esi - movl $R(_userconfig_from_boot),%edi - movl $512,%ecx - cld - rep - movsb -#endif /* USERCONFIG_BOOT */ - ret diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index f6f735d..688a5c2 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.115 1998/10/09 23:36:25 peter Exp $ + * $Id: locore.s,v 1.116 1998/10/10 13:37:16 kato Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -599,15 +599,6 @@ olddiskboot: movl 12(%ebp),%eax movl %eax,R(_bootdev) -#if defined(USERCONFIG_BOOT) && defined(USERCONFIG) - movl $0x10200, %esi - movl $R(_userconfig_from_boot),%edi - movl $512,%ecx - cld - rep - movsb -#endif /* USERCONFIG_BOOT */ - ret diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index fd58e5a..faa7707 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.313 1998/10/09 23:36:26 peter Exp $ + * $Id: machdep.c,v 1.314 1998/10/30 05:41:14 msmith Exp $ */ #include "apm.h" @@ -433,14 +433,7 @@ again: } #if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) { -#else - if (boothowto & RB_CONFIG) { -#endif - userconfig(); - cninit(); /* the preferred console may have changed */ - } + userconfig(); #endif printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count), |
