Deleted Added
sdiff udiff text old ( 119168 ) new ( 153430 )
full compact
main.c (119168) main.c (153430)
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last attempt in the `sysinstall' line, the next
5 * generation being slated for what's essentially a complete rewrite.
6 *
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last attempt in the `sysinstall' line, the next
5 * generation being slated for what's essentially a complete rewrite.
6 *
7 * $FreeBSD: head/usr.sbin/sade/main.c 119168 2003-08-20 06:27:21Z imp $
7 * $FreeBSD: head/usr.sbin/sade/main.c 153430 2005-12-15 01:04:51Z iedowse $
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

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

115 if (!variable_cmp(VAR_SKIP_PCCARD, "YES") &&
116 variable_get(VAR_SKIP_PCCARD)!=1 &&
117 !pvariable_get("pccardInitialize")) {
118 pccardInitialize();
119 pvariable_set("pccardInitialize=1");
120 }
121#endif
122
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

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

115 if (!variable_cmp(VAR_SKIP_PCCARD, "YES") &&
116 variable_get(VAR_SKIP_PCCARD)!=1 &&
117 !pvariable_get("pccardInitialize")) {
118 pccardInitialize();
119 pvariable_set("pccardInitialize=1");
120 }
121#endif
122
123 /* Initialize USB, if we haven't already done so. */
124 if (!pvariable_get("usbInitialize")) {
125 usbInitialize();
126 pvariable_set("usbInitialize=1");
127 }
128
129 /* Probe for all relevant devices on the system */
130 deviceGetAll();
131
132 /* Prompt for the driver floppy if appropriate. */
133 if (!pvariable_get("driverFloppyCheck")) {
134 driverFloppyCheck();
135 pvariable_set("driverFloppyCheck=1");
136 }

--- 51 unchanged lines hidden --- 		123 /* Probe for all relevant devices on the system */
124 deviceGetAll();
125
126 /* Prompt for the driver floppy if appropriate. */
127 if (!pvariable_get("driverFloppyCheck")) {
128 driverFloppyCheck();
129 pvariable_set("driverFloppyCheck=1");
130 }

--- 51 unchanged lines hidden ---