summaryrefslogtreecommitdiffstats
path: root/make_boot_img
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-12-05 17:13:54 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-12-05 17:13:54 +0000
commit2c70f98fd37d4f4a81630830a8abab87084cfa9a (patch)
tree746f59ad1b2119a3884e232c0823ea88b90c4fab /make_boot_img
parentf06fc2cef872084dcca9d28230763c42ece44569 (diff)
downloaddrakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar
drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar.gz
drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar.bz2
drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar.xz
drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.zip
- fix problems with sockets not initialized (disabling
hotplug support -> cardmgr handles sockets) - fix problems with PCMCIA net adapters now using PCI modules, by adding PCMCIA base code in `network.img'
Diffstat (limited to 'make_boot_img')
-rwxr-xr-xmake_boot_img3
1 files changed, 1 insertions, 2 deletions
diff --git a/make_boot_img b/make_boot_img
index 71ebf2277..64bcfe013 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -116,8 +116,7 @@ sub initrd {
_ "$sudo mknod $mnt/dev/ttyp0 c 3 0";
}
- my $ftype = $type =~ /^(all)$/ ? "pcmcia" : $type;
- if ($ftype eq "pcmcia" && $arch !~ /ppc/ && $arch !~ /ia64/) {
+ if (member($type, qw(pcmcia all network)) && $arch !~ /ppc/ && $arch !~ /ia64/) {
_ "$sudo cp -a /etc/pcmcia $mnt/etc";
patch_pcmcia_config("$mnt/etc");
}