Deleted Added
full compact
bootinfo.c (64187) bootinfo.c (66133)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/boot/i386/libi386/bootinfo.c 64187 2000-08-03 09:14:02Z jhb $
26 * $FreeBSD: head/sys/boot/i386/libi386/bootinfo.c 66133 2000-09-20 18:13:36Z archie $
27 */
28
29#include <stand.h>
30#include <sys/param.h>
31#include <sys/reboot.h>
32#include <sys/linker.h>
33#include <machine/bootinfo.h>
34#include "bootstrap.h"

--- 48 unchanged lines hidden (view full) ---

83 howto |= RB_CONFIG;
84 break;
85 case 'C':
86 howto |= RB_CDROM;
87 break;
88 case 'd':
89 howto |= RB_KDB;
90 break;
27 */
28
29#include <stand.h>
30#include <sys/param.h>
31#include <sys/reboot.h>
32#include <sys/linker.h>
33#include <machine/bootinfo.h>
34#include "bootstrap.h"

--- 48 unchanged lines hidden (view full) ---

83 howto |= RB_CONFIG;
84 break;
85 case 'C':
86 howto |= RB_CDROM;
87 break;
88 case 'd':
89 howto |= RB_KDB;
90 break;
91 case 'm':
92 howto |= RB_MUTE;
93 break;
91 case 'g':
92 howto |= RB_GDB;
93 break;
94 case 'h':
95 howto |= RB_SERIAL;
96 break;
97 case 'r':
98 howto |= RB_DFLTROOT;

--- 12 unchanged lines hidden (view full) ---

111 }
112 }
113 /* get equivalents from the environment */
114 for (i = 0; howto_names[i].ev != NULL; i++)
115 if (getenv(howto_names[i].ev) != NULL)
116 howto |= howto_names[i].mask;
117 if (!strcmp(getenv("console"), "comconsole"))
118 howto |= RB_SERIAL;
94 case 'g':
95 howto |= RB_GDB;
96 break;
97 case 'h':
98 howto |= RB_SERIAL;
99 break;
100 case 'r':
101 howto |= RB_DFLTROOT;

--- 12 unchanged lines hidden (view full) ---

114 }
115 }
116 /* get equivalents from the environment */
117 for (i = 0; howto_names[i].ev != NULL; i++)
118 if (getenv(howto_names[i].ev) != NULL)
119 howto |= howto_names[i].mask;
120 if (!strcmp(getenv("console"), "comconsole"))
121 howto |= RB_SERIAL;
122 if (!strcmp(getenv("console"), "nullconsole"))
123 howto |= RB_MUTE;
119 return(howto);
120}
121
122/*
123 * Copy the environment into the load area starting at (addr).
124 * Each variable is formatted as <name>=<value>, with a single nul
125 * separating each variable, and a double nul terminating the environment.
126 */

--- 217 unchanged lines hidden ---
124 return(howto);
125}
126
127/*
128 * Copy the environment into the load area starting at (addr).
129 * Each variable is formatted as <name>=<value>, with a single nul
130 * separating each variable, and a double nul terminating the environment.
131 */

--- 217 unchanged lines hidden ---