d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the USERCONFIG_BOOT semantics closer to what was original

Browse Source 
intended.
This commit is contained in:
Jordan K. Hubbard 1996-12-14 22:18:43 +00:00
parent b755bb110f
commit c40e48ec21
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/amd64/amd64/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.218 1996/12/11 05:52:15 dyson Exp $
* $Id: machdep.c,v 1.219 1996/12/12 04:20:50 davidg Exp $
*/
#include "npx.h"
@ -363,18 +363,16 @@ cpu_startup(dummy)
for (i = 1; i < ncallout; i++)
callout[i-1].c_next = &callout[i];
#if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
boothowto |= RB_CONFIG;
#endif
#if defined(USERCONFIG)
#if defined(USERCONFIG_BOOT)
if (1) {
#else
if (boothowto & RB_CONFIG) {
#ifdef USERCONFIG
#endif
userconfig();
cninit(); /* the preferred console may have changed */
#else
printf("Sorry! no userconfig in this kernel\n");
#endif
}
#endif
#ifdef BOUNCE_BUFFERS
/*

16
sys/i386/i386/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.218 1996/12/11 05:52:15 dyson Exp $
* $Id: machdep.c,v 1.219 1996/12/12 04:20:50 davidg Exp $
*/
#include "npx.h"
@ -363,18 +363,16 @@ cpu_startup(dummy)
for (i = 1; i < ncallout; i++)
callout[i-1].c_next = &callout[i];
#if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
boothowto |= RB_CONFIG;
#endif
#if defined(USERCONFIG)
#if defined(USERCONFIG_BOOT)
if (1) {
#else
if (boothowto & RB_CONFIG) {
#ifdef USERCONFIG
#endif
userconfig();
cninit(); /* the preferred console may have changed */
#else
printf("Sorry! no userconfig in this kernel\n");
#endif
}
#endif
#ifdef BOUNCE_BUFFERS
/*

6
sys/i386/i386/userconfig.c
View File

@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
** $Id: userconfig.c,v 1.72 1996/12/14 18:07:17 joerg Exp $
** $Id: userconfig.c,v 1.73 1996/12/14 22:02:58 joerg Exp $
**/
/**
@ -132,7 +132,7 @@ getchar(void)
if (next == userconfig_from_boot) {
if (strncmp(next, "USERCONFIG\n", 11)) {
next++;
strcpy(next, "quit\n");
strcpy(next, "intro\n");
} else {
next += 11;
}
@ -2220,7 +2220,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: userconfig.c,v 1.72 1996/12/14 18:07:17 joerg Exp $
* $Id: userconfig.c,v 1.73 1996/12/14 22:02:58 joerg Exp $
*/
#include "scbus.h"