summaryrefslogtreecommitdiffstats
path: root/loader2/kbd.c
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2006-06-12 17:43:59 +0000
committerDavid Cantrell <dcantrell@redhat.com>2006-06-12 17:43:59 +0000
commite79e0942edb54246fecfe242647df8170c308f13 (patch)
treedae9b8d3b556c179f09e71f64ffd864ae137a988 /loader2/kbd.c
parentffe866cc310ab410418a7a0ed0723a22fd29085c (diff)
downloadanaconda-e79e0942edb54246fecfe242647df8170c308f13.tar.gz
anaconda-e79e0942edb54246fecfe242647df8170c308f13.tar.xz
anaconda-e79e0942edb54246fecfe242647df8170c308f13.zip
Make the boot flags variable global. We don't need to pass it (or a pointer to it) all over the place.
Diffstat (limited to 'loader2/kbd.c')
-rw-r--r--loader2/kbd.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/loader2/kbd.c b/loader2/kbd.c
index f8de6c98b..dc87abe67 100644
--- a/loader2/kbd.c
+++ b/loader2/kbd.c
@@ -31,7 +31,10 @@
#include "../isys/stubs.h"
#include "../isys/lang.h"
-int chooseKeyboard(struct loaderData_s * loaderData, char ** kbdtypep, int flags) {
+/* boot flags */
+extern int flags;
+
+int chooseKeyboard(struct loaderData_s * loaderData, char ** kbdtypep) {
int num = -1;
int rc;
gzFile f;
@@ -65,7 +68,7 @@ int chooseKeyboard(struct loaderData_s * loaderData, char ** kbdtypep, int flags
}
#endif /* sparc */
- numLanguages = getLangInfo(&languages, flags);
+ numLanguages = getLangInfo(&languages);
lang = getenv("LANG");
if (!lang)
@@ -166,7 +169,7 @@ int chooseKeyboard(struct loaderData_s * loaderData, char ** kbdtypep, int flags
}
void setKickstartKeyboard(struct loaderData_s * loaderData, int argc,
- char ** argv, int * flagsPtr) {
+ char ** argv) {
if (argc < 2) {
logMessage(ERROR, "no argument passed to keyboard kickstart command");
return;