summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-01 16:49:11 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-01 16:49:11 +0000
commit3819e80657b42bd0c49fa958c837ea64915947d2 (patch)
treefeb58ac266e65bcf4b33787e26ffd7e2587711cc
parent1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2 (diff)
downloaddrakx-3819e80657b42bd0c49fa958c837ea64915947d2.tar
drakx-3819e80657b42bd0c49fa958c837ea64915947d2.tar.gz
drakx-3819e80657b42bd0c49fa958c837ea64915947d2.tar.bz2
drakx-3819e80657b42bd0c49fa958c837ea64915947d2.tar.xz
drakx-3819e80657b42bd0c49fa958c837ea64915947d2.zip
use pcmcia-socket-startup from /lib/udev for latest pcmciautils
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm2
-rw-r--r--perl-install/install/share/list.xml2
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1b72b0c0b..96e067b00 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -13,6 +13,7 @@
- remove "Generate auto install floppy" & "Save packages selection"
options at end of installation
- update package managment icons
+- use pcmcia-socket-startup from /lib/udev for latest pcmciautils
Version 11.29 - 29 August 2008
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index eca8014b2..8390aabc7 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1376,7 +1376,7 @@ sub configure_pcmcia {
log::l("configuring PCMCIA controller ($o->{pcmcia})");
symlink "/tmp/stage2/$_", $_ foreach "/etc/pcmcia";
eval { modules::load($o->{pcmcia}, 'pcmcia') };
- run_program::run("pcmcia-socket-startup");
+ run_program::run("/lib/udev/pcmcia-socket-startup");
}
1;
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index a64492c45..bdd27c089 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -173,7 +173,7 @@
/usr/share/themes/Ia Ora Smooth/
</from>
- /sbin/pcmcia-socket-startup
+ /lib/udev/pcmcia-socket-startup
/etc/pcmcia/config.opts
<from expand="glob">