This patch removes some obsolete flags, and hooks up a few of the
legacy no(usb|firewire|etc) flags into blacklists for the appropriate
modules.
Comments?
Bill
diff --git a/loader2/loader.c b/loader2/loader.c
index 1b2bce5..8dd4a9c 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -737,26 +737,12 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData,
flags |= LOADER_FLAGS_NOSHELL;
else if (!strcasecmp(argv[i], "mediacheck"))
flags |= LOADER_FLAGS_MEDIACHECK;
- else if (!strcasecmp(argv[i], "nousbstorage"))
- flags |= LOADER_FLAGS_NOUSBSTORAGE;
- else if (!strcasecmp(argv[i], "nousb"))
- flags |= LOADER_FLAGS_NOUSB;
- else if (!strcasecmp(argv[i], "ub"))
- flags |= LOADER_FLAGS_UB;
else if (!strcasecmp(argv[i], "allowwireless"))
flags |= LOADER_FLAGS_ALLOW_WIRELESS;
else if (!strcasecmp(argv[i], "telnet"))
flags |= LOADER_FLAGS_TELNETD;
- else if (!strcasecmp(argv[i], "nofirewire"))
- flags |= LOADER_FLAGS_NOIEEE1394;
- else if (!strcasecmp(argv[i], "nonet"))
- flags |= LOADER_FLAGS_NONET;
- else if (!strcasecmp(argv[i], "nostorage"))
- flags |= LOADER_FLAGS_NOSTORAGE;
else if (!strcasecmp(argv[i], "noprobe"))
- flags |= (LOADER_FLAGS_NONET | LOADER_FLAGS_NOSTORAGE | LOADER_FLAGS_NOUSB | LOADER_FLAGS_NOIEEE1394);
- else if (!strcasecmp(argv[i], "nopcmcia"))
- flags |= LOADER_FLAGS_NOPCMCIA;
+ flags |= LOADER_FLAGS_NOPROBE;
else if (!strcasecmp(argv[i], "text")) {
logMessage(INFO, "text mode forced from cmdline");
flags |= LOADER_FLAGS_TEXT;
@@ -792,6 +778,15 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData,
flags |= LOADER_FLAGS_NOIPV6;
else if (!strcasecmp(argv[i], "kssendmac"))
flags |= LOADER_FLAGS_KICKSTART_SEND_MAC;
+ /* deprecated hardware bits */
+ else if (!strcasecmp(argv[i], "nousbstorage"))
+ mlAddBlacklist("usb-storage");
+ else if (!strcasecmp(argv[i], "nousb")) {
+ mlAddBlacklist("ehci-hcd");
+ mlAddBlacklist("ohci-hcd");
+ mlAddBlacklist("uhci-hcd");
+ } else if (!strcasecmp(argv[i], "nofirewire"))
+ mlAddBlacklist("firewire-ohci");
else if (!strncasecmp(argv[i], "loglevel=", 9)) {
if (!strcasecmp(argv[i]+9, "debug")) {
loaderData->logLevel = strdup(argv[i]+9);
diff --git a/loader2/loader.h b/loader2/loader.h
index 44a39a8..1a36e13 100644
--- a/loader2/loader.h
+++ b/loader2/loader.h
@@ -36,7 +36,7 @@
#define LOADER_FLAGS_KICKSTART (((uint64_t) 1) << 4)
#define LOADER_FLAGS_KICKSTART_SEND_MAC (((uint64_t) 1) << 5)
#define LOADER_FLAGS_POWEROFF (((uint64_t) 1) << 6)
-#define LOADER_FLAGS_NONET (((uint64_t) 1) << 7)
+#define LOADER_FLAGS_NOPROBE (((uint64_t) 1) << 7)
#define LOADER_FLAGS_MODDISK (((uint64_t) 1) << 8)
/* #9 is the most delicious of all flags, also available for use */
#define LOADER_FLAGS_SERIAL (((uint64_t) 1) << 10)
@@ -45,21 +45,20 @@
#define LOADER_FLAGS_HALT (((uint64_t) 1) << 13)
#define LOADER_FLAGS_SELINUX (((uint64_t) 1) << 14)
#define LOADER_FLAGS_VIRTPCONSOLE (((uint64_t) 1) << 15)
-#define LOADER_FLAGS_NOUSB (((uint64_t) 1) << 16)
+/* #16 unused */
#define LOADER_FLAGS_NOSHELL (((uint64_t) 1) << 17)
#define LOADER_FLAGS_NOPCMCIA (((uint64_t) 1) << 18)
#define LOADER_FLAGS_TELNETD (((uint64_t) 1) << 19)
#define LOADER_FLAGS_NOPASS (((uint64_t) 1) << 20)
-#define LOADER_FLAGS_UB (((uint64_t) 1) << 21)
+/* #21 unused */
#define LOADER_FLAGS_MEDIACHECK (((uint64_t) 1) << 22)
-#define LOADER_FLAGS_NOUSBSTORAGE (((uint64_t) 1) << 23)
+/* #23 unused */
#define LOADER_FLAGS_ASKMETHOD (((uint64_t) 1) << 24)
#define LOADER_FLAGS_ASKNETWORK (((uint64_t) 1) << 25)
-#define LOADER_FLAGS_NOIEEE1394 (((uint64_t) 1) << 26)
-#define LOADER_FLAGS_NOFB (((uint64_t) 1) << 27)
+/* #26 unused */
+/* #27 unused */
#define LOADER_FLAGS_CMDLINE (((uint64_t) 1) << 28)
#define LOADER_FLAGS_GRAPHICAL (((uint64_t) 1) << 29)
-#define LOADER_FLAGS_NOSTORAGE (((uint64_t) 1) << 30)
#define LOADER_FLAGS_NOIPV4 (((uint64_t) 1) << 31)
#define LOADER_FLAGS_NOIPV6 (((uint64_t) 1) << 32)
#define LOADER_FLAGS_IP_PARAM (((uint64_t) 1) << 33)
@@ -74,31 +73,22 @@
#define FL_KICKSTART(a) ((a) & LOADER_FLAGS_KICKSTART)
#define FL_KICKSTART_SEND_MAC(a) ((a) & LOADER_FLAGS_KICKSTART_SEND_MAC)
#define FL_POWEROFF(a) ((a) & LOADER_FLAGS_POWEROFF)
-#define FL_NONET(a) ((a) & LOADER_FLAGS_NONET)
+#define FL_NOPROBE(a) ((a) & LOADER_FLAGS_NOPROBE)
#define FL_MODDISK(a) ((a) & LOADER_FLAGS_MODDISK)
#define FL_SERIAL(a) ((a) & LOADER_FLAGS_SERIAL)
#define FL_UPDATES(a) ((a) & LOADER_FLAGS_UPDATES)
#define FL_KSFILE(a) ((a) & LOADER_FLAGS_KSFILE)
-#define FL_NOUSB(a) ((a) & LOADER_FLAGS_NOUSB)
#define FL_NOSHELL(a) ((a) & LOADER_FLAGS_NOSHELL)
-#define FL_NOFB(a) ((a) & LOADER_FLAGS_NOFB)
-#define FL_NOPCMCIA(a) ((a) & LOADER_FLAGS_NOPCMCIA)
#define FL_TELNETD(a) ((a) & LOADER_FLAGS_TELNETD)
#define FL_NOPASS(a) ((a) & LOADER_FLAGS_NOPASS)
#define FL_MEDIACHECK(a) ((a) & LOADER_FLAGS_MEDIACHECK)
-#define FL_NOUSBSTORAGE(a) ((a) & LOADER_FLAGS_NOUSBSTORAGE)
#define FL_ASKMETHOD(a) ((a) & LOADER_FLAGS_ASKMETHOD)
-#define FL_NOIEEE1394(a) ((a) & LOADER_FLAGS_NOIEEE1394)
-#define FL_NOFB(a) ((a) & LOADER_FLAGS_NOFB)
#define FL_GRAPHICAL(a) ((a) & LOADER_FLAGS_GRAPHICAL)
#define FL_CMDLINE(a) ((a) & LOADER_FLAGS_CMDLINE)
#define FL_HALT(a) ((a) & LOADER_FLAGS_HALT)
#define FL_SELINUX(a) ((a) & LOADER_FLAGS_SELINUX)
#define FL_VIRTPCONSOLE(a) ((a) & LOADER_FLAGS_VIRTPCONSOLE)
-#define FL_NOSTORAGE(a) ((a) & LOADER_FLAGS_NOSTORAGE)
-#define FL_NOPROBE(a) (FL_NOSTORAGE((a)) | FL_NONET((a)))
#define FL_ASKNETWORK(a) ((a) & LOADER_FLAGS_ASKNETWORK)
-#define FL_UB(a) ((a) & LOADER_FLAGS_UB)
#define FL_NOIPV4(a) ((a) & LOADER_FLAGS_NOIPV4)
#define FL_NOIPV6(a) ((a) & LOADER_FLAGS_NOIPV6)
#define FL_IP_PARAM(a) ((a) & LOADER_FLAGS_IP_PARAM)
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
