Use "$device" instead of hardwired device names in insert/remove lines

of /etc/pccard.conf.sample

1 files changed, 78 insertions, 78 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index c916c78..d0db4f9 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -22,59 +22,59 @@ memory	0xd4000  96k
 card "Aironet" "PC4800"
         config  0x5 "an0" ?
         insert  echo Aironet PC4500 inserted
-        insert  /etc/pccard_ether an0
+        insert  /etc/pccard_ether $device
         remove  echo Aironet PC4500 removed
-        remove  /sbin/ifconfig an0 delete
+        remove  /sbin/ifconfig $device delete
 
 # Aironet PC4800 11Mbps 802.11 wireless NIC
 card "Aironet" "PC4800"
         config  0x5 "an0" ?
         insert  echo Aironet PC4800 inserted
-        insert  /etc/pccard_ether an0
+        insert  /etc/pccard_ether $device
         remove  echo Aironet PC4800 removed
-        remove  /sbin/ifconfig an0 delete
+        remove  /sbin/ifconfig $device delete
 
 # Lucent WaveLAN/IEEE
 card "Lucent Technologies" "WaveLAN/IEEE"
 	config	0x1 "wi0" ?
 	insert	echo WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether wi0
+	insert	/etc/pccard_ether $device
 	remove	echo WaveLAN/IEEE removed
-	remove	/sbin/ifconfig wi0 delete
+	remove	/sbin/ifconfig $device delete
 
 # NCR WaveLAN/IEEE
 card "NCR" "WaveLAN/IEEE"
 	config	0x1 "wi0" ?
 	insert	echo WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether wi0
+	insert	/etc/pccard_ether $device
 	remove	echo WaveLAN/IEEE removed
-	remove	/sbin/ifconfig wi0 delete
+	remove	/sbin/ifconfig $device delete
 
 # Cabletron RoamAbout, WaveLAN/IEEE clone
 card "Cabletron" "RoamAbout 802.11 DS"
 	config	0x1 "wi0" ?
 	insert	echo WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether wi0
+	insert	/etc/pccard_ether $device
 	remove	echo WaveLAN/IEEE removed
-	remove	/sbin/ifconfig wi0 delete
+	remove	/sbin/ifconfig $device delete
 
 # IBM PCMCIA Ethernet I/II
 card "IBM Corp." "Ethernet"
 	config	0x1 "ed0" ?
 	ether	0xff0
 	insert	echo IBM PCMCIA Ethernet inserted
-	insert	/etc/pccard_ether ed0
+	insert	/etc/pccard_ether $device
 	remove	echo IBM PCMCIA Ethernet removed
-	remove	/sbin/ifconfig ed0 delete
+	remove	/sbin/ifconfig $device delete
 
 # Melco LPC-T (PIO mode)
 card "PCMCIA" "UE2212"
 	config	0x1 "ed0" ? 0x10
 	ether	0xff0
 	insert	echo UE2212 inserted
-	insert	/etc/pccard_ether ed0
+	insert	/etc/pccard_ether $device
 	remove	echo UE2212 card removed
-	remove	/sbin/ifconfig ed0 delete
+	remove	/sbin/ifconfig $device delete
 
 # Accton EN2212
 # Very slow!  (PIO mode)
@@ -82,142 +82,142 @@ card "ACCTON" "EN2212"
 	config	0x1 "ed0" ? 0x10
 	ether	0xff0
 	insert	echo Accton EN2212 inserted
-	insert	/etc/pccard_ether ed0
+	insert	/etc/pccard_ether $device
 	remove	echo Accton EN2212 removed
-	remove	/sbin/ifconfig ed0 delete
+	remove	/sbin/ifconfig $device delete
 
 #Accton 2216
 card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 	config 0x20 "ed0" ?
 	insert echo Accton 2216 inserted
-	insert /etc/pccard_ether ed0
+	insert /etc/pccard_ether $device
 	remove echo Accton 2216 removed
-	remove /sbin/ifconfig ed0 delete
+	remove /sbin/ifconfig $device delete
 
 # COREGA EtherII PCC-T
 card "corega K.K." "corega EtherII PCC-T"
 	config  0x20 "ed0" ?
 	insert  echo EtherII PCC-T inserted
-	insert  /etc/pccard_ether ed0
+	insert  /etc/pccard_ether $device
 	remove  echo EtherII PCC-T removed
-	remove  /sbin/ifconfig ed0 delete
+	remove  /sbin/ifconfig $device delete
 
 # I-O DATA PCLATE
 card "IO DATA" "PCLATE"
 	config  0x20 "ed0" ? 0x10
 	insert  echo IO DATA PCLATE inserted
-	insert  /etc/pccard_ether ed0
+	insert  /etc/pccard_ether $device
 	remove  echo IO DATA PCLATE removed
-	remove  /sbin/ifconfig ed0 delete
+	remove  /sbin/ifconfig $device delete
 
 # 3Com Etherlink III 3C589B, 3C589C
 card "3Com Corporation" "3C589"
 	config	0x1 "ep0" ?
 	insert	echo 3Com Etherlink III inserted
-	insert	/etc/pccard_ether ep0 -link0 link1
-#	insert	/etc/pccard_ether ep0 link0 -link1
+	insert	/etc/pccard_ether $device -link0 link1
+#	insert	/etc/pccard_ether $device link0 -link1
 	remove	echo 3Com Etherlink III removed
-	remove	/sbin/ifconfig ep0 delete
+	remove	/sbin/ifconfig $device delete
 
 # 3Com Etherlink III 3C589D
 card "3Com Corporation" "3C589D"
 	config	0x1 "ep0" ?
 	insert	echo 3Com Etherlink III inserted
-	insert	/etc/pccard_ether ep0
+	insert	/etc/pccard_ether $device
 	remove	echo 3Com Etherlink III removed
-	remove	/sbin/ifconfig ep0 delete
+	remove	/sbin/ifconfig $device delete
 
 # 3Com Fast Etherlink 3C574TX
 card "3Com" "3C574-TX Fast EtherLink PC Card"
 	config	0x1 "ep0" ? 0x1
 	insert	echo 3Com Fast Etherlink 3C574TX inserted
-	insert	/etc/pccard_ether ep0
+	insert	/etc/pccard_ether $device
 	remove	echo 3Com Fast Etherlink 3C574TX removed
-	remove	/sbin/ifconfig ep0 delete
+	remove	/sbin/ifconfig $device delete
 
 # 3Com Megahertz 574B
 card "3Com" "Megahertz 574B"
 	config  0x1 "ep0" ? 0x1
 	insert  echo 3Com Megahertz 574B inserted
-	insert  /etc/pccard_ether ep0
+	insert  /etc/pccard_ether $device
 	remove  echo 3Com Megahertz 574B removed
-	remove  /sbin/ifconfig ep0 delete
+	remove  /sbin/ifconfig $device delete
 
 # LinkSys ethernet card
 card "E-CARD" "E-CARD" 
 	config  0x20 "ed0" ? 
 	insert  echo "LinkSys card inserted" 
-	insert  /etc/pccard_ether ed0 
+	insert  /etc/pccard_ether $device 
 	remove  echo "LinkSys card removed" 
-	remove	/sbin/ifconfig ed0 delete
+	remove	/sbin/ifconfig $device delete
 
 # Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
 card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
 	config 0x1 "ed0" ? 
 	insert echo Linksys Ethernet inserted 
-	insert /etc/pccard_ether ed0 
+	insert /etc/pccard_ether $device 
 	remove echo Linksys Ethernet removed 
-	remove /sbin/ifconfig ed0 delete 
+	remove /sbin/ifconfig $device delete 
 
 #Linksys EtherFast 10/100 PC Card (PCMPC100)
 card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
 	config	0x3 "ed0" ?
 	insert	echo Linksys Fast 100-BaseT inserted
-	insert	/etc/pccard_ether ed0
+	insert	/etc/pccard_ether $device
 	remove	echo Linksys Fast 100-BaseT removed
-	remove	/sbin/ifconfig ed0 delete
+	remove	/sbin/ifconfig $device delete
 
 # Farallon EtherMac
 card "Farallon" "ENet"
 	config	0x1 "ep0" ?
 	insert	echo Farallon EtherMac inserted
-	insert	/etc/pccard_ether ep0
-#	insert	/etc/pccard_ether ep0 link0
+	insert	/etc/pccard_ether $device
+#	insert	/etc/pccard_ether $device link0
 	remove	echo Farallon EtherMac removed
-	remove	/sbin/ifconfig ep0 delete
+	remove	/sbin/ifconfig $device delete
 
 # Fujitsu MBH10302
 card "PCMCIA MBH10302" "01"
 	config  0x14 "fe0" ?
 	insert  echo Fujitsu MBH10302 inserted
-	insert	/etc/pccard_ether fe0
+	insert	/etc/pccard_ether $device
 	remove  echo Fujitsu MBH10302 removed
-	remove	/sbin/ifconfig fe0 delete
+	remove	/sbin/ifconfig $device delete
 
 # NextCom J Link NC5310
 card "NextComK.K." "NC5310 Ver1.0      "
 	config  0x14 "fe0" ?
 	insert  echo NextCom J Link NC5310 inserted
-	insert	/etc/pccard_ether fe0
+	insert	/etc/pccard_ether $device
 	remove  echo NextCom J Link NC5310 removed
-	remove	/sbin/ifconfig fe0 delete
+	remove	/sbin/ifconfig $device delete
 
 # HITACHI HT-4840-11
 card "HITACHI" "HT-4840-11"
 	config	0x1a "fe0" ?
 	insert	echo HT-4840-11 inserted
-	insert	/etc/pccard_ether fe0
+	insert	/etc/pccard_ether $device
 	remove	echo HT-4840-11 removed
-	remove	/sbin/ifconfig fe0 delete
+	remove	/sbin/ifconfig $device delete
 
 # Danpex (Alloy, etc.) EN-6200P2
 card "DANPEX" "EN-6200P2"
 	config 0x22 "ed0" ?
-	insert /etc/pccard_ether ed0
-	remove /sbin/ifconfig ed0 delete
+	insert /etc/pccard_ether $device
+	remove /sbin/ifconfig $device delete
 
 # Fujitsu MBH10303 Ethernet PCMCIA
 card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
 	config 0x1 "fe0" ?
-	insert /etc/pccard_ether fe0
-        remove /sbin/ifconfig fe0 delete
+	insert /etc/pccard_ether $device
+        remove /sbin/ifconfig $device delete
 
 # Compex Net-A adapter
 card "Ethernet" "Adapter"
 	config 0x1 "ed0" ?
 	ether 0xff0
-	insert	/etc/pccard_ether ed0
-	remove	/sbin/ifconfig ed0 delete
+	insert	/etc/pccard_ether $device
+	remove	/sbin/ifconfig $device delete
  
 # Telecom Device SuperSocket RE450T
 # Note: There are several revisions of the cardon the market.
@@ -231,61 +231,61 @@ card "Ethernet" "Adapter"
 	config	0x2 "ed0" ?
 #	ether	0x110 00:e0:98
 #	ether	0xff0 00:e0:98
-	insert	/etc/pccard_ether ed0
-	remove	/sbin/ifconfig ed0 delete
+	insert	/etc/pccard_ether $device
+	remove	/sbin/ifconfig $device delete
 
 # D-Link DE-660 NE2000 clone
 card "D-Link" "DE-660"
 	config 0x20 "ed0" ? 0x10
-	insert /etc/pccard_ether ed0 link0 -link1
-	remove /sbin/ifconfig ed0 delete
+	insert /etc/pccard_ether $device link0 -link1
+	remove /sbin/ifconfig $device delete
 
 # NDC Ethernet Instant-Link NE2000 clone
 card "NDC" "Ethernet"
 	config 0x22 "ed0" ? 0x10
 	insert	echo NDC Ethernet Instant-Link adapter inserted
-	insert	/etc/pccard_ether ed0
+	insert	/etc/pccard_ether $device
 	remove	echo NDC Ethernet Instant-Link adapter removed
-	remove	/sbin/ifconfig ed0 delete
+	remove	/sbin/ifconfig $device delete
 
 # CyQ've ELA-010
 card "CyQ've" "ELA-010"
 	config	0x20 "ed0" ?
-	insert	/etc/pccard_ether ed0
-	remove	/sbin/ifconfig ed0 delete
+	insert	/etc/pccard_ether $device
+	remove	/sbin/ifconfig $device delete
 
 # Allied Telesis CentreCOM LA-PCM_V2 ethernet card
 # NTT-DATA ASTROWINK-M/MMOIL(IrLAN) ethernet card
 card "Allied Telesis, K.K." "CentreCOM LA-PCM_V2"
 	config 0x20 "ed0" ?
 	insert echo CentreCOM LA-PCM V2 Ethernet card inserted
-	insert /etc/pccard_ether ed0
+	insert /etc/pccard_ether $device
 	remove echo CentreCOM LA-PCM V2 Ethernet card removed
-	remove ifconfig ed0 delete
+	remove ifconfig $device delete
 
 #  Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison)
 card "Intel" "EtherExpress(TM) PRO/100 PC C"
 	config  0x1 "xe0" ?
 	insert  echo Intel EtherExpress PRO/100 Mobile Adapter/16 inserted
-	insert	/etc/pccard_ether xe0
+	insert	/etc/pccard_ether $device
 	remove  echo Intel EtherExpress PRO/100 Mobile Adapter/16 removed
-	remove  ifconfig xe0 delete
+	remove  ifconfig $device delete
 
 # BayNetworks NETGEAR FA410TXC Fast Ethernet
 card "NETGEAR" "FA410TX"
 	config  0x20 "ed0" ?
 	insert  echo NETGEAR FA410TX Ethernet inserted
-	insert  /etc/pccard_ether ed0
+	insert  /etc/pccard_ether $device
 	remove  echo NETGEAR FA410TX Ethernet removed
-	remove  ifconfig ed0 delete
+	remove  ifconfig $device delete
 
 # Network Everywhere Ethernet 10BaseT PC Card
 card "Network Everywhere" "Ethernet 10BaseT PC Card"
 	config  0x1 "ed0" ?
 	insert  echo Network Everywhere Ethernet 10BaseT PC Card inserted
-	insert  /etc/pccard_ether ed0
+	insert  /etc/pccard_ether $device
 	remove  echo Network Everywhere Ethernet 10BaseT PC Card removed
-	remove  /sbin/ifconfig ed0 delete
+	remove  /sbin/ifconfig $device delete
 
 
 # AIWA PV-JF288
@@ -459,9 +459,9 @@ card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
 card "Xircom" "CreditCard 10/100"
 	config  0x1 "xe0" ?
 	insert  echo Xircom CreditCard Ethernet inserted
-	insert	/etc/pccard_ether xe0
+	insert	/etc/pccard_ether $device
 	remove  echo Xircom CreditCard Ethernet removed
-	remove	/etc/pccard_ether xe0 delete
+	remove	/etc/pccard_ether $device delete
 
 # Xircom GlobalACCESS modem
 card "Xircom" "CreditCard Modem 56 - GlobalA"
@@ -473,9 +473,9 @@ card "Xircom" "CreditCard Modem 56 - GlobalA"
 card "Xircom" "16-bit Ethernet + Modem 56"
 	config 0x27 "xe0" 9
 	insert  echo Xircom Realport Ethernet inserted
-	insert	/etc/pccard_ether xe0
+	insert	/etc/pccard_ether $device
 	remove  echo Xircom Realport Ethernet removed
-	remove	/etc/pccard_ether xe0 delete
+	remove	/etc/pccard_ether $device delete
 
 # GATEWAY 2000 FAX/Data Modem (14.4K)
 card "GATEWAY2000" "CC3144"
@@ -615,9 +615,9 @@ card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax"
 card "3Com" "Megahertz 589E"
         config 0x1 "ep0" ?
         insert echo 3Com Megahertz Ethernet card inserted
-        insert /etc/pccard_ether ep0
+        insert /etc/pccard_ether $device
         remove echo 3Com Megahertz Ethernet card removed
-        remove /sbin/ifconfig ep0 delete
+        remove /sbin/ifconfig $device delete
 
 # 3Com/USR/MegaHertz 3CCM156
 card "3COM" "3CCM156"
@@ -629,9 +629,9 @@ card "3COM" "3CCM156"
 card "IC-CARD" "IC-CARD"
 	config 0x20 "ed0" ?
 	insert echo AR-P500 Ethernet card inserted
-	insert /etc/pccard_ether ed0
+	insert /etc/pccard_ether $device
 	remove echo AR-P500 Ethernet card removed
-	remove ifconfig ed0 delete
+	remove ifconfig $device delete
 
 #Eiger 33.6 modem
 card "AT&T" "V34+ Fax Modem"
@@ -647,9 +647,9 @@ card "Motorola" "MONTANA 33.6 FAX/MODEM"
 card "AmbiCom Inc" "AMB8002T"
 	config 0x20 "ed0" ?
 	insert echo AmbiCom 8002T inserted
-	insert /etc/pccard_ether ed0
+	insert /etc/pccard_ether $device
 	remove echo AmbiCom 8002T removed
-	remove /sbin/ifconfig ed0 delete
+	remove /sbin/ifconfig $device delete
 
 # 3Com OfficeConnect 3CXSH572BT
 #This had auto, so the config slot might be wrong.  Replace it by the