# HG changeset patch
# Parent 9ad214c389bd636b8a8afff8450b894b2b60f0fd
Hurd: Use %iface_file_name% for pid files and lease files

diff --git a/inet.defn b/inet.defn
--- a/inet.defn
+++ b/inet.defn
@@ -426,9 +426,9 @@
 
   up
     [[Warning: Option hwaddress: %hwaddress% not yet supported]]
-    dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -v -pf /run/dhclient.%iface_file_name%.pid -lf /var/lib/dhcp/dhclient.%iface_file_name%.leases %iface% \
         if (execable("/sbin/dhclient"))
-    udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
+    udhcpc -n -p /run/udhcpc.%iface_file_name%.pid -i %iface% [[-H %hostname%]] \
            [[-c %client%]] \
         elsif (execable("/sbin/udhcpc"))
     dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
@@ -436,9 +436,9 @@
         elsif (execable("/sbin/dhcpcd"))
 
   down
-    dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -v -r -pf /run/dhclient.%iface_file_name%.pid -lf /var/lib/dhcp/dhclient.%iface_file_name%.leases %iface% \
         if (execable("/sbin/dhclient"))
-    kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid) \
+    kill -USR2 $(cat /run/udhcpc.%iface_file_name%.pid); kill -TERM $(cat /run/udhcpc.%iface_file_name%.pid) \
         elsif (execable("/sbin/udhcpc"))
     dhcpcd -k %iface% \
         elsif (execable("/sbin/dhcpcd"))
@@ -487,10 +487,10 @@
     provider name  -- Use /name/ as the provider (from /etc/wvdial.conf).
   up
     /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
-                      -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]]
+                      -p /run/wvdial.%iface_file_name%.pid -b -m -- [[ %provider% ]]
   down
     /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
-                      -p /run/wvdial.%iface%.pid -s 2
+                      -p /run/wvdial.%iface_file_name%.pid -s 2
 
 
 method ipv4ll
diff --git a/inet6.defn b/inet6.defn
--- a/inet6.defn
+++ b/inet6.defn
@@ -327,11 +327,11 @@
   up
     [[Warning: Option hwaddress: %hwaddress% not yet supported]]
     inetutils-ifconfig --interface %iface% --up
-    dhclient -6 -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+    dhclient -6 -pf /run/dhclient6.%iface_file_name%.pid -lf /var/lib/dhcp/dhclient6.%iface_file_name%.leases %iface% \
         if (execable("/sbin/dhclient"))
 
   down
-    dhclient -6 -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+    dhclient -6 -r -pf /run/dhclient6.%iface_file_name%.pid -lf /var/lib/dhcp/dhclient6.%iface_file_name%.leases %iface% \
         if (execable("/sbin/dhclient"))
     inetutils-ifconfig --interface %iface% --down