Mageia Bugzilla – Attachment 8069 Details for
Bug 12394
Drop "linux noauto" [was: "linux noauto" does not lead to the setupSCSI (HARD DRIVE DETECTION) screen]
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
drop noauto support from drakx (stage1 & 2)
0001-kill-noauto-support-mga-12394-drakx.patch (text/plain), 7.72 KB, created by
Thierry Vignaud
on 2016-06-24 22:34:22 CEST
(
hide
)
Description:
drop noauto support from drakx (stage1 & 2)
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2016-06-24 22:34:22 CEST
Size:
7.72 KB
patch
obsolete
>From 710f1d9c96e3058dfd924ca4f4cdd8c1e352fd55 Mon Sep 17 00:00:00 2001 >From: Thierry Vignaud <thierry.vignaud@gmail.com> >Date: Fri, 24 Jun 2016 22:29:23 +0200 >Subject: [PATCH] kill noauto support (mga#12394) > >there's still references in help in standalone.pm but that would break >translation >--- > images/advanced.msg.xml | 1 - > images/help.msg.xml | 2 +- > mdk-stage1/params.c | 1 - > mdk-stage1/probing.c | 8 ++++---- > mdk-stage1/stage1.c | 3 +-- > mdk-stage1/stage1.h | 2 -- > perl-install/any.pm | 1 - > perl-install/detect_devices.pm | 5 +---- > perl-install/install/install2.pm | 1 - > perl-install/standalone.pm | 2 -- > 10 files changed, 7 insertions(+), 19 deletions(-) > >diff --git a/images/advanced.msg.xml b/images/advanced.msg.xml >index 9f0bb18..ccb0877 100644 >--- a/images/advanced.msg.xml >+++ b/images/advanced.msg.xml >@@ -7,7 +7,6 @@ The following options may be added on the command line : > o <white>readonly=1</white> to disable editing disk partitions. > o <white>display=ackbar:0</white> to export display to <blue>ackbar</blue> machine screen 0 during > installation (only for network installations). >- o <white>noauto</white> to disable automatic detection. > o <white>nodmraid</white> to disable BIOS software RAID. > o <white>updatemodules</white> to use the special update floppy containing modules updates. > o <white>patch</white> to use a patch from the floppy (file named <blue>patch.pl</blue>). >diff --git a/images/help.msg.xml b/images/help.msg.xml >index 358dcf2..54896ff 100644 >--- a/images/help.msg.xml >+++ b/images/help.msg.xml >@@ -17,5 +17,5 @@ You can also pass some <white><specific kernel options></white> to the Lin > For example, try <white>linux noapic</white> if your system has trouble operating > your network adapter correctly. > <red>NOTE</red>: You cannot pass options to modules (SCSI, ethernet card) or devices >-such as CD-ROM drives in this way. If you need to do so, use noauto mode. >+such as CD-ROM drives in this way. > </document> >diff --git a/mdk-stage1/params.c b/mdk-stage1/params.c >index 9398759..9c181ba 100644 >--- a/mdk-stage1/params.c >+++ b/mdk-stage1/params.c >@@ -84,7 +84,6 @@ void process_cmdline(void) > !strcmp(name, "kamethod")) set_param(MODE_RESCUE); > if (!strcmp(name, "rescue")) set_param(MODE_RESCUE); > if (!strcmp(name, "keepmounted")) set_param(MODE_KEEP_MOUNTED); >- if (!strcmp(name, "noauto")) set_param(MODE_NOAUTO); > if (!strcmp(name, "netauto")) set_param(MODE_NETAUTO); > if (!strcmp(name, "debugstage1")) set_param(MODE_DEBUGSTAGE1); > if (!strcmp(name, "automatic")) { >diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c >index 956038d..abba5da 100644 >--- a/mdk-stage1/probing.c >+++ b/mdk-stage1/probing.c >@@ -274,7 +274,7 @@ void discovered_device(enum driver_type type, const char * description, const ch > wait_message("Loading driver for media adapter:\n \n%s", description); > failed = my_modprobe(driver, MEDIA_ADAPTERS, NULL); > alternate = get_alternate_module(driver); >- if (!IS_NOAUTO && alternate) { >+ if (alternate) { > failed = failed || my_modprobe(alternate, MEDIA_ADAPTERS, NULL); > } > remove_wait_message(); >@@ -400,7 +400,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u > #endif > #ifdef ENABLE_USB > case USB_CONTROLLERS: >- if (already_probed_usb_controllers || IS_NOAUTO) >+ if (already_probed_usb_controllers) > break; > already_probed_usb_controllers = 1; > probe_pci_modules(type, usb_controller_modules, usb_controller_modules_len); >@@ -420,7 +420,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u > > #ifdef ENABLE_USB > /* ---- USB probe ---------------------------------------------- */ >- if ((bus == BUS_USB || bus == BUS_ANY) && !(IS_NOAUTO)) { >+ if (bus == BUS_USB || bus == BUS_ANY) { > static int already_mounted_usbdev = 0; > struct pciusb_entries entries; > int i; >@@ -454,7 +454,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u > > #ifdef ENABLE_PCMCIA > /* ---- PCMCIA probe ---------------------------------------------- */ >- if ((bus == BUS_PCMCIA || bus == BUS_ANY) && !(IS_NOAUTO)) { >+ if (bus == BUS_PCMCIA || bus == BUS_ANY) { > struct pcmcia_alias * pcmciadb = NULL; > unsigned int len = 0; > char *base = "/sys/bus/pcmcia/devices"; >diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c >index 94bb1e0..77cdd8c 100644 >--- a/mdk-stage1/stage1.c >+++ b/mdk-stage1/stage1.c >@@ -400,8 +400,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) > thirdparty_load_modules(); > > #ifdef ENABLE_PCMCIA >- if (!IS_NOAUTO) >- handle_pcmcia(); >+ handle_pcmcia(); > #endif > > handle_hid(); >diff --git a/mdk-stage1/stage1.h b/mdk-stage1/stage1.h >index 5752413..2c24414 100644 >--- a/mdk-stage1/stage1.h >+++ b/mdk-stage1/stage1.h >@@ -38,7 +38,6 @@ extern char * interactive_fifo; > #define MODE_RAMDISK (1 << 9) > #define MODE_CHANGEDISK (1 << 10) > #define MODE_THIRDPARTY (1 << 11) >-#define MODE_NOAUTO (1 << 12) > #define MODE_NETAUTO (1 << 13) > #define MODE_RECOVERY (1 << 14) > >@@ -48,7 +47,6 @@ extern char * interactive_fifo; > #define IS_DEBUGSTAGE1 (get_param(MODE_DEBUGSTAGE1)) > #define IS_CHANGEDISK (get_param(MODE_CHANGEDISK)) > #define IS_THIRDPARTY (get_param(MODE_THIRDPARTY)) >-#define IS_NOAUTO (get_param(MODE_NOAUTO)) > #define IS_NETAUTO (get_param(MODE_NETAUTO)) > #define IS_RECOVERY (get_param(MODE_RECOVERY)) > #define KEEP_MOUNTED (!IS_RESCUE || get_param(MODE_KEEP_MOUNTED)) >diff --git a/perl-install/any.pm b/perl-install/any.pm >index a9ea0d3..71ddaf5 100644 >--- a/perl-install/any.pm >+++ b/perl-install/any.pm >@@ -1437,7 +1437,6 @@ You can use userdrake to add a user to this group.") > } > > sub monitor_full_edid() { >- return if $::noauto; > > my ($vbe, $edid); > { >diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm >index 8cff4d9..626ee71 100644 >--- a/perl-install/detect_devices.pm >+++ b/perl-install/detect_devices.pm >@@ -1113,7 +1113,7 @@ Return list of PCMCIA controllers > > sub pcmcia_controller_probe() { > my ($controller) = probe_category('bus/pcmcia'); >- if (!$controller && !$::testing && !$::noauto && arch() =~ /i.86/) { >+ if (!$controller && !$::testing && arch() =~ /i.86/) { > my $driver = c::pcmcia_probe(); > $controller = { driver => $driver, description => "PCMCIA controller ($driver)" } if $driver; > } >@@ -1175,12 +1175,9 @@ It's usually called through a higher level filtering function. > > # pcmcia_probe provides field "device", used in network.pm > sub probeall() { >- return if $::noauto; >- > pci_probe(), usb_probe(), firewire_probe(), pcmcia_probe(), dmi_probe(), getInputDevices_and_usb(); > } > sub probeall_update_cache() { >- return if $::noauto; > @pci = pci_probe__real(), @usb = usb_probe__real(), firewire_probe(), pcmcia_probe(), dmi_probe(); > } > sub matching_desc__regexp { >diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm >index 05fd0b3..ab63d75 100644 >--- a/perl-install/install/install2.pm >+++ b/perl-install/install/install2.pm >@@ -561,7 +561,6 @@ sub parse_args { > 'security=s' => \$o->{security}, > > # auto install options: >- noauto => \$::noauto, > testing => \$::testing, > patch => \$patch, > 'defcfg=s' => \$cfg, >diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm >index 806ebf7..885fde4 100644 >--- a/perl-install/standalone.pm >+++ b/perl-install/standalone.pm >@@ -165,8 +165,6 @@ foreach (@ARGV) { > $::isEmbedded = 1; > } elsif (/^--expert$/) { > $::expert = 1; >- } elsif (/^--noauto$/) { >- $::noauto = /-noauto/; > } elsif (/^--auto$/) { > $::auto = 1; > } elsif (/^--testing$/) { >-- >2.9.0 >
From 710f1d9c96e3058dfd924ca4f4cdd8c1e352fd55 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud <thierry.vignaud@gmail.com> Date: Fri, 24 Jun 2016 22:29:23 +0200 Subject: [PATCH] kill noauto support (mga#12394) there's still references in help in standalone.pm but that would break translation --- images/advanced.msg.xml | 1 - images/help.msg.xml | 2 +- mdk-stage1/params.c | 1 - mdk-stage1/probing.c | 8 ++++---- mdk-stage1/stage1.c | 3 +-- mdk-stage1/stage1.h | 2 -- perl-install/any.pm | 1 - perl-install/detect_devices.pm | 5 +---- perl-install/install/install2.pm | 1 - perl-install/standalone.pm | 2 -- 10 files changed, 7 insertions(+), 19 deletions(-) diff --git a/images/advanced.msg.xml b/images/advanced.msg.xml index 9f0bb18..ccb0877 100644 --- a/images/advanced.msg.xml +++ b/images/advanced.msg.xml @@ -7,7 +7,6 @@ The following options may be added on the command line : o <white>readonly=1</white> to disable editing disk partitions. o <white>display=ackbar:0</white> to export display to <blue>ackbar</blue> machine screen 0 during installation (only for network installations). - o <white>noauto</white> to disable automatic detection. o <white>nodmraid</white> to disable BIOS software RAID. o <white>updatemodules</white> to use the special update floppy containing modules updates. o <white>patch</white> to use a patch from the floppy (file named <blue>patch.pl</blue>). diff --git a/images/help.msg.xml b/images/help.msg.xml index 358dcf2..54896ff 100644 --- a/images/help.msg.xml +++ b/images/help.msg.xml @@ -17,5 +17,5 @@ You can also pass some <white><specific kernel options></white> to the Lin For example, try <white>linux noapic</white> if your system has trouble operating your network adapter correctly. <red>NOTE</red>: You cannot pass options to modules (SCSI, ethernet card) or devices -such as CD-ROM drives in this way. If you need to do so, use noauto mode. +such as CD-ROM drives in this way. </document> diff --git a/mdk-stage1/params.c b/mdk-stage1/params.c index 9398759..9c181ba 100644 --- a/mdk-stage1/params.c +++ b/mdk-stage1/params.c @@ -84,7 +84,6 @@ void process_cmdline(void) !strcmp(name, "kamethod")) set_param(MODE_RESCUE); if (!strcmp(name, "rescue")) set_param(MODE_RESCUE); if (!strcmp(name, "keepmounted")) set_param(MODE_KEEP_MOUNTED); - if (!strcmp(name, "noauto")) set_param(MODE_NOAUTO); if (!strcmp(name, "netauto")) set_param(MODE_NETAUTO); if (!strcmp(name, "debugstage1")) set_param(MODE_DEBUGSTAGE1); if (!strcmp(name, "automatic")) { diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 956038d..abba5da 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -274,7 +274,7 @@ void discovered_device(enum driver_type type, const char * description, const ch wait_message("Loading driver for media adapter:\n \n%s", description); failed = my_modprobe(driver, MEDIA_ADAPTERS, NULL); alternate = get_alternate_module(driver); - if (!IS_NOAUTO && alternate) { + if (alternate) { failed = failed || my_modprobe(alternate, MEDIA_ADAPTERS, NULL); } remove_wait_message(); @@ -400,7 +400,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u #endif #ifdef ENABLE_USB case USB_CONTROLLERS: - if (already_probed_usb_controllers || IS_NOAUTO) + if (already_probed_usb_controllers) break; already_probed_usb_controllers = 1; probe_pci_modules(type, usb_controller_modules, usb_controller_modules_len); @@ -420,7 +420,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u #ifdef ENABLE_USB /* ---- USB probe ---------------------------------------------- */ - if ((bus == BUS_USB || bus == BUS_ANY) && !(IS_NOAUTO)) { + if (bus == BUS_USB || bus == BUS_ANY) { static int already_mounted_usbdev = 0; struct pciusb_entries entries; int i; @@ -454,7 +454,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u #ifdef ENABLE_PCMCIA /* ---- PCMCIA probe ---------------------------------------------- */ - if ((bus == BUS_PCMCIA || bus == BUS_ANY) && !(IS_NOAUTO)) { + if (bus == BUS_PCMCIA || bus == BUS_ANY) { struct pcmcia_alias * pcmciadb = NULL; unsigned int len = 0; char *base = "/sys/bus/pcmcia/devices"; diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 94bb1e0..77cdd8c 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -400,8 +400,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) thirdparty_load_modules(); #ifdef ENABLE_PCMCIA - if (!IS_NOAUTO) - handle_pcmcia(); + handle_pcmcia(); #endif handle_hid(); diff --git a/mdk-stage1/stage1.h b/mdk-stage1/stage1.h index 5752413..2c24414 100644 --- a/mdk-stage1/stage1.h +++ b/mdk-stage1/stage1.h @@ -38,7 +38,6 @@ extern char * interactive_fifo; #define MODE_RAMDISK (1 << 9) #define MODE_CHANGEDISK (1 << 10) #define MODE_THIRDPARTY (1 << 11) -#define MODE_NOAUTO (1 << 12) #define MODE_NETAUTO (1 << 13) #define MODE_RECOVERY (1 << 14) @@ -48,7 +47,6 @@ extern char * interactive_fifo; #define IS_DEBUGSTAGE1 (get_param(MODE_DEBUGSTAGE1)) #define IS_CHANGEDISK (get_param(MODE_CHANGEDISK)) #define IS_THIRDPARTY (get_param(MODE_THIRDPARTY)) -#define IS_NOAUTO (get_param(MODE_NOAUTO)) #define IS_NETAUTO (get_param(MODE_NETAUTO)) #define IS_RECOVERY (get_param(MODE_RECOVERY)) #define KEEP_MOUNTED (!IS_RESCUE || get_param(MODE_KEEP_MOUNTED)) diff --git a/perl-install/any.pm b/perl-install/any.pm index a9ea0d3..71ddaf5 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1437,7 +1437,6 @@ You can use userdrake to add a user to this group.") } sub monitor_full_edid() { - return if $::noauto; my ($vbe, $edid); { diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 8cff4d9..626ee71 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1113,7 +1113,7 @@ Return list of PCMCIA controllers sub pcmcia_controller_probe() { my ($controller) = probe_category('bus/pcmcia'); - if (!$controller && !$::testing && !$::noauto && arch() =~ /i.86/) { + if (!$controller && !$::testing && arch() =~ /i.86/) { my $driver = c::pcmcia_probe(); $controller = { driver => $driver, description => "PCMCIA controller ($driver)" } if $driver; } @@ -1175,12 +1175,9 @@ It's usually called through a higher level filtering function. # pcmcia_probe provides field "device", used in network.pm sub probeall() { - return if $::noauto; - pci_probe(), usb_probe(), firewire_probe(), pcmcia_probe(), dmi_probe(), getInputDevices_and_usb(); } sub probeall_update_cache() { - return if $::noauto; @pci = pci_probe__real(), @usb = usb_probe__real(), firewire_probe(), pcmcia_probe(), dmi_probe(); } sub matching_desc__regexp { diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 05fd0b3..ab63d75 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -561,7 +561,6 @@ sub parse_args { 'security=s' => \$o->{security}, # auto install options: - noauto => \$::noauto, testing => \$::testing, patch => \$patch, 'defcfg=s' => \$cfg, diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index 806ebf7..885fde4 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -165,8 +165,6 @@ foreach (@ARGV) { $::isEmbedded = 1; } elsif (/^--expert$/) { $::expert = 1; - } elsif (/^--noauto$/) { - $::noauto = /-noauto/; } elsif (/^--auto$/) { $::auto = 1; } elsif (/^--testing$/) { -- 2.9.0
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 12394
:
4848
|
8068
| 8069