summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-04-01 09:30:11 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-04-01 09:30:11 +0000
commitdb26373d5065646c6b55ff76d27480ee0866ce89 (patch)
treec501125c6605b6808689b7da70042a9dd5ed6bf4
parent89639cec273d0f7a266991e62329a363e5ad5236 (diff)
downloaddrakx-backup-do-not-use-db26373d5065646c6b55ff76d27480ee0866ce89.tar
drakx-backup-do-not-use-db26373d5065646c6b55ff76d27480ee0866ce89.tar.gz
drakx-backup-do-not-use-db26373d5065646c6b55ff76d27480ee0866ce89.tar.bz2
drakx-backup-do-not-use-db26373d5065646c6b55ff76d27480ee0866ce89.tar.xz
drakx-backup-do-not-use-db26373d5065646c6b55ff76d27480ee0866ce89.zip
list service_harddrake_confirm too
-rw-r--r--perl-install/Makefile.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 22a535230..2f572b348 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -13,7 +13,7 @@ SUDO = sudo
SO_FILES = c/blib/arch/auto/c/c.so
PMS_DIRS = Newt Xconfig c xf86misc diskdrake harddrake interactive modules network partition_table printer resize_fat sbus_probing security
PMS = *.pm $(PMS_DIRS:%=%/*.pm) commands install2
-STANDALONEPMS_ = XFdrake adduserdrake diskdrake drakTermServ drakautoinst drakauth drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfloppy drakfont drakgw drakhelp drakperm drakproxy drakpxe draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset harddrake2 keyboarddrake localedrake logdrake lsnetdrake mousedrake net_monitor printerdrake scannerdrake service_harddrake
+STANDALONEPMS_ = XFdrake adduserdrake diskdrake drakTermServ drakautoinst drakauth drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfloppy drakfont drakgw drakhelp drakperm drakproxy drakpxe draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset harddrake2 keyboarddrake localedrake logdrake lsnetdrake mousedrake net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm
STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
ALLPMS = $(PMS) $(STANDALONEPMS) share/advertising/*.pl
return alternate;
+ }
+ }
+ return NULL;
+}
+#endif
+
void discovered_device(enum driver_type type,
unsigned short vendor, unsigned short device, unsigned short subvendor, unsigned short subdevice,
const char * description, const char * driver)
@@ -246,8 +274,13 @@ void discovered_device(enum driver_type type,
log_message("PCI: device %04x %04x %04x %04x is \"%s\", driver is %s", vendor, device, subvendor, subdevice, description, driver);
#ifndef DISABLE_MEDIAS
if (type == SCSI_ADAPTERS) {
+ const char * alternate = NULL;
wait_message("Loading driver for SCSI adapter:\n \n%s", description);
failed = my_insmod(driver, SCSI_ADAPTERS, NULL, 1);
+ alternate = get_alternate_module(driver);
+ if (!IS_NOAUTO && alternate) {
+ failed = failed || my_insmod(alternate, SCSI_ADAPTERS, NULL, 1);
+ }
remove_wait_message();
warning_insmod_failed(failed);
}