From 3819e80657b42bd0c49fa958c837ea64915947d2 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 1 Sep 2008 16:49:11 +0000
Subject: use pcmcia-socket-startup from /lib/udev for latest pcmciautils

---
 perl-install/install/NEWS           | 1 +
 perl-install/install/any.pm         | 2 +-
 perl-install/install/share/list.xml | 2 +-
 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">
-- 
cgit v1.2.1