summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-25 12:06:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-25 12:06:45 +0000
commit66f809314490471dc468aee6397ad46fc315a1f6 (patch)
tree96fd3cddde06e2a5514d98a797919aa80def0adb /perl-install
parent8dc071939b214cfad634146ed1a93923e7b1b780 (diff)
downloaddrakx-66f809314490471dc468aee6397ad46fc315a1f6.tar
drakx-66f809314490471dc468aee6397ad46fc315a1f6.tar.gz
drakx-66f809314490471dc468aee6397ad46fc315a1f6.tar.bz2
drakx-66f809314490471dc468aee6397ad46fc315a1f6.tar.xz
drakx-66f809314490471dc468aee6397ad46fc315a1f6.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog9
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/modules.pm12
3 files changed, 17 insertions, 6 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 3f4bd55cc..256214406 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-25 Pixel <pixel@mandrakesoft.com>
+
+ * modules.pm: added 8139too
+
+ * share/Cards+: GeForce2 DDR is handled by driver "nv"
+
+ * Xconfigurator.pm (main): in killall X for Xdrakres, also killall
+ kdm/xdm/gdm/autologin :)
+
2000-09-25 DrakX <install@linux-mandrake.com>
* snapshot uploaded
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index b9e008c1b..b63985024 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1099,7 +1099,7 @@ Current configuration is:
exec qw(perl -e), q{
my $wm = shift;
for (my $nb = 30; $nb && `pidof "$wm"` > 0; $nb--) { sleep 1 }
- system("killall X") unless `pidof "$wm"` > 0;
+ system("killall X ; killall -15 xdm gdm kdm autologin") unless `pidof "$wm"` > 0;
}, $_;
}
$found = 1; last;
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index da299df0c..d0e77ec83 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -87,6 +87,7 @@ arch() =~ /^sparc/ ? (
"3c59x" => "3com 3c59x (Vortex)",
"de4x5" => "Digital 425,434,435,450,500",
"rtl8139" => "RealTek RTL8129/8139",
+ "8139too" => "Realtek RTL-8139",
}],
[ 'net_raw', {
"8390" => "8390",
@@ -205,14 +206,15 @@ arch() !~ /^sparc/ ? (
"emu10k1" => "Creative Labs|SB Live! (audio)",
# "au8820" => "Aureal Semiconductor|Vortex 1",
# "au8830" => "Aureal Semiconductor|Vortex 2",
- "snd-card-ymfpci" => "Yamaha Corporation|YMF-740",
- "snd-card-trident" => "Silicon Integrated Systems [SiS]|7018 PCI Audio",
"snd-card-cs461x" => "Cirrus Logic|CS 4610/11 [CrystalClear SoundFusion Audio Accelerator]",
- "snd-card-via686a" => "VIA Technologies|VT82C686 [Apollo Super AC97/Audio]",
+ "snd-card-ens1371" => "Ensoniq/Creative Labs ES1371",
"snd-card-es1938" => "ESS Technology|ES1969 Solo-1 Audiodrive",
- "snd-card-rme96" => "Xilinx, Inc.|RME Digi96<>Xilinx, Inc.",
- "snd-card-intel8x0" => "Intel Corporation|82440MX AC'97 Audio Controller<>Intel Corporation",
"snd-card-fm801" => "Fortemedia, Inc|Xwave QS3000A [FM801]<>Fortemedia, Inc|FM801 PCI Audio",
+ "snd-card-intel8x0" => "Intel Corporation|82440MX AC'97 Audio Controller<>Intel Corporation",
+ "snd-card-rme96" => "Xilinx, Inc.|RME Digi96<>Xilinx, Inc.",
+ "snd-card-trident" => "Silicon Integrated Systems [SiS]|7018 PCI Audio",
+ "snd-card-via686a" => "VIA Technologies|VT82C686 [Apollo Super AC97/Audio]",
+ "snd-card-ymfpci" => "Yamaha Corporation|YMF-740",
) : (),
}],
[ 'pcmcia', {