blob: 77e2ce78b20e615d3215ac37bdac874247efd308 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
$NetBSD: patch-ac,v 1.3 2005/08/21 15:08:46 jmmv Exp $
--- stage2/boot.c 2004-03-30 13:44:08.000000000 +0200
+++ stage2/boot.c 2005-07-25 21:55:29.000000000 +0200
@@ -22,6 +22,7 @@
#include "shared.h"
#include "freebsd.h"
+#include "netbsd_reboot.h"
#include "imgact_aout.h"
#include "i386-elf.h"
@@ -872,6 +873,91 @@
* variables.
*/
+int
+netbsd_value(char arg)
+{
+ switch (arg) {
+ case 'a':
+ return(NB_RB_ASKNAME);
+ break;
+ case 'b':
+ return(NB_RB_HALT);
+ break;
+ case 'c':
+ return(NB_RB_USERCONF);
+ break;
+ case 'd':
+ return(NB_RB_KDB);
+ break;
+ case 'm':
+ return(NB_RB_MINIROOT);
+ break;
+ case 'q':
+ return(NB_AB_QUIET);
+ break;
+ case 's':
+ return(NB_RB_SINGLE);
+ break;
+ case 'v':
+ return(NB_AB_VERBOSE);
+ break;
+ case 'x':
+ return(NB_AB_DEBUG);
+ break;
+ case 'z':
+ return(NB_AB_SILENT);
+ break;
+ default:
+ break;
+ }
+ return(0);
+}
+
+int
+freebsd_value(char arg)
+{
+ switch (arg) {
+ case 'C':
+ return(RB_CDROM);
+ break;
+ case 'a':
+ return(RB_ASKNAME);
+ break;
+ case 'b':
+ return(RB_HALT);
+ break;
+ case 'c':
+ return(RB_CONFIG);
+ break;
+ case 'd':
+ return(RB_KDB);
+ break;
+ case 'D':
+ return(RB_MULTIPLE);
+ break;
+ case 'g':
+ return(RB_GDB);
+ break;
+ case 'h':
+ return(RB_SERIAL);
+ break;
+ case 'm':
+ return(RB_MUTE);
+ break;
+ case 'r':
+ return(RB_DFLTROOT);
+ break;
+ case 's':
+ return(RB_SINGLE);
+ break;
+ case 'v':
+ return(RB_VERBOSE);
+ break;
+ default:
+ break;
+ }
+ return(0);
+}
void
bsd_boot (kernel_t type, int bootdev, char *arg)
@@ -894,31 +980,12 @@
{
while (*str && *str != ' ')
{
- if (*str == 'C')
- clval |= RB_CDROM;
- if (*str == 'a')
- clval |= RB_ASKNAME;
- if (*str == 'b')
- clval |= RB_HALT;
- if (*str == 'c')
- clval |= RB_CONFIG;
- if (*str == 'd')
- clval |= RB_KDB;
- if (*str == 'D')
- clval |= RB_MULTIPLE;
- if (*str == 'g')
- clval |= RB_GDB;
- if (*str == 'h')
- clval |= RB_SERIAL;
- if (*str == 'm')
- clval |= RB_MUTE;
- if (*str == 'r')
- clval |= RB_DFLTROOT;
- if (*str == 's')
- clval |= RB_SINGLE;
- if (*str == 'v')
- clval |= RB_VERBOSE;
- str++;
+ if (type == KERNEL_TYPE_NETBSD) {
+ clval |= netbsd_value(*str);
+ } else {
+ clval |= freebsd_value(*str);
+ }
+ str++;
}
continue;
}
|
