diff options
Diffstat (limited to 'modutils/modprobe.c')
-rw-r--r-- | modutils/modprobe.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index c1a1828d7..fb6c65990 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -101,12 +101,15 @@ | |||
101 | //usage: ) | 101 | //usage: ) |
102 | //usage:#endif /* !ENABLE_MODPROBE_SMALL */ | 102 | //usage:#endif /* !ENABLE_MODPROBE_SMALL */ |
103 | 103 | ||
104 | /* Note that usage text doesn't document various 2.4 options | 104 | /* Note: usage text doesn't document various 2.4 options |
105 | * we pull in through INSMOD_OPTS define */ | 105 | * we pull in through INSMOD_OPTS define |
106 | #define MODPROBE_OPTS "alrD" IF_FEATURE_MODPROBE_BLACKLIST("b") | 106 | * Note2: -b is always accepted, but if !FEATURE_MODPROBE_BLACKLIST, |
107 | * it is a no-op. | ||
108 | */ | ||
109 | #define MODPROBE_OPTS "alrDb" | ||
107 | /* -a and -D _are_ in fact compatible */ | 110 | /* -a and -D _are_ in fact compatible */ |
108 | #define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl") | 111 | #define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl") |
109 | //#define MODPROBE_OPTS "acd:lnrt:C:" IF_FEATURE_MODPROBE_BLACKLIST("b") | 112 | //#define MODPROBE_OPTS "acd:lnrt:C:b" |
110 | //#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al" | 113 | //#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al" |
111 | enum { | 114 | enum { |
112 | OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */ | 115 | OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */ |
@@ -133,10 +136,8 @@ static const char modprobe_longopts[] ALIGN1 = | |||
133 | /* module-init-tools 3.11.1 has only long opt --show-depends | 136 | /* module-init-tools 3.11.1 has only long opt --show-depends |
134 | * but no short -D, we provide long opt for scripts which | 137 | * but no short -D, we provide long opt for scripts which |
135 | * were written for 3.11.1: */ | 138 | * were written for 3.11.1: */ |
136 | "show-depends\0" No_argument "D" | 139 | "show-depends\0" No_argument "D" |
137 | // IF_FEATURE_MODPROBE_BLACKLIST( | ||
138 | // "use-blacklist\0" No_argument "b" | 140 | // "use-blacklist\0" No_argument "b" |
139 | // ) | ||
140 | ; | 141 | ; |
141 | #endif | 142 | #endif |
142 | 143 | ||