Deleted Added
full compact
init_main.c (64880) init_main.c (65374)
1/*
2 * Copyright (c) 1995 Terrence R. Lambert
3 * All rights reserved.
4 *
5 * Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
6 * The Regents of the University of California. All rights reserved.
7 * (c) UNIX System Laboratories, Inc.
8 * All or some portions of this file are derived from material licensed

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

34 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
35 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
37 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
38 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39 * SUCH DAMAGE.
40 *
41 * @(#)init_main.c 8.9 (Berkeley) 1/21/94
1/*
2 * Copyright (c) 1995 Terrence R. Lambert
3 * All rights reserved.
4 *
5 * Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
6 * The Regents of the University of California. All rights reserved.
7 * (c) UNIX System Laboratories, Inc.
8 * All or some portions of this file are derived from material licensed

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

34 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
35 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
37 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
38 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39 * SUCH DAMAGE.
40 *
41 * @(#)init_main.c 8.9 (Berkeley) 1/21/94
42 * $FreeBSD: head/sys/kern/init_main.c 64880 2000-08-20 21:34:39Z phk $
42 * $FreeBSD: head/sys/kern/init_main.c 65374 2000-09-02 19:17:34Z phk $
43 */
44
45#include "opt_init_path.h"
43 */
44
45#include "opt_init_path.h"
46#include "opt_devfs.h"
47
48#include <sys/param.h>
49#include <sys/file.h>
50#include <sys/filedesc.h>
51#include <sys/kernel.h>
52#include <sys/mount.h>
53#include <sys/sysctl.h>
54#include <sys/proc.h>
55#include <sys/resourcevar.h>
56#include <sys/signalvar.h>
57#include <sys/systm.h>
58#include <sys/vnode.h>
59#include <sys/sysent.h>
60#include <sys/reboot.h>
61#include <sys/sysproto.h>
62#include <sys/vmmeter.h>
63#include <sys/unistd.h>
64#include <sys/malloc.h>
46
47#include <sys/param.h>
48#include <sys/file.h>
49#include <sys/filedesc.h>
50#include <sys/kernel.h>
51#include <sys/mount.h>
52#include <sys/sysctl.h>
53#include <sys/proc.h>
54#include <sys/resourcevar.h>
55#include <sys/signalvar.h>
56#include <sys/systm.h>
57#include <sys/vnode.h>
58#include <sys/sysent.h>
59#include <sys/reboot.h>
60#include <sys/sysproto.h>
61#include <sys/vmmeter.h>
62#include <sys/unistd.h>
63#include <sys/malloc.h>
64#include <sys/conf.h>
65
66#include <machine/cpu.h>
67
68#include <vm/vm.h>
69#include <vm/vm_param.h>
70#include <sys/lock.h>
71#include <vm/pmap.h>
72#include <vm/vm_map.h>

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

494 options = 1;
495 }
496#endif
497
498#ifdef BOOTCDROM
499 (void)subyte(--ucp, 'C');
500 options = 1;
501#endif
65
66#include <machine/cpu.h>
67
68#include <vm/vm.h>
69#include <vm/vm_param.h>
70#include <sys/lock.h>
71#include <vm/pmap.h>
72#include <vm/vm_map.h>

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

494 options = 1;
495 }
496#endif
497
498#ifdef BOOTCDROM
499 (void)subyte(--ucp, 'C');
500 options = 1;
501#endif
502#ifdef DEVFS
503 (void)subyte(--ucp, 'd');
504 options = 1;
505#endif
502 if (devfs_present) {
503 (void)subyte(--ucp, 'd');
504 options = 1;
505 }
506
506 if (options == 0)
507 (void)subyte(--ucp, '-');
508 (void)subyte(--ucp, '-'); /* leading hyphen */
509 arg1 = ucp;
510
511 /*
512 * Move out the file name (also arg 0).
513 */

--- 70 unchanged lines hidden ---
507 if (options == 0)
508 (void)subyte(--ucp, '-');
509 (void)subyte(--ucp, '-'); /* leading hyphen */
510 arg1 = ucp;
511
512 /*
513 * Move out the file name (also arg 0).
514 */

--- 70 unchanged lines hidden ---