From 184f2cd48a46abf0407a775cc7ea42d3483df613 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 12 Sep 2017 10:56:07 -0700
Subject: s6-rc examples: Change usage of import to importas.

execline's import is deprecated but the examples in s6-rc have not yet
been updated to use importas.
---
 examples/source/dns-cache/run        | 2 +-
 examples/source/dns-server-tcp-4/run | 2 +-
 examples/source/dns-server-udp/run   | 2 +-
 examples/source/fifodir-cleanup/run  | 2 +-
 examples/source/httpd-4/run          | 2 +-
 examples/source/identd-4/run         | 2 +-
 examples/source/init-lan/up          | 6 +++---
 examples/source/init-sysctl/up       | 2 +-
 examples/source/init-wlan0/up        | 2 +-
 examples/source/mount-cgroups/up     | 2 +-
 examples/source/mount-rwfs/up        | 2 +-
 examples/source/mount-swap/down      | 2 +-
 examples/source/mount-swap/up        | 2 +-
 examples/source/mount-sync/up        | 2 +-
 examples/source/ntpclient/run        | 2 +-
 examples/source/qmtpd-4/run          | 2 +-
 examples/source/smtpd-4/run          | 2 +-
 examples/source/sshd-4/run           | 2 +-
 examples/source/taiclockd-4/run      | 2 +-
 examples/source/udhcpc-eth3/run      | 2 +-
 examples/source/udhcpd-wlan0/run     | 2 +-
 21 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/examples/source/dns-cache/run b/examples/source/dns-cache/run
index b364c97..8aa7e3b 100755
--- a/examples/source/dns-cache/run
+++ b/examples/source/dns-cache/run
@@ -2,7 +2,7 @@
 fdmove -c 2 1
 s6-envuidgid dnscache
 s6-envdir env
-import ETH0_IP4
+importas ETH0_IP4 ETH0_IP4
 export IP ${ETH0_IP4}
 s6-softlimit -m 4000000
 pipeline -d
diff --git a/examples/source/dns-server-tcp-4/run b/examples/source/dns-server-tcp-4/run
index d418999..50bba29 100755
--- a/examples/source/dns-server-tcp-4/run
+++ b/examples/source/dns-server-tcp-4/run
@@ -3,7 +3,7 @@ fdmove -c 2 1
 s6-envuidgid dnsserve
 export ROOT /home/dns
 export AXFR ""
-import -ui ETH1_IP4
+importas -ui ETH1_IP4 ETH1_IP4
 fdmove 1 3
 s6-tcpserver4 -v 2 -1 -- ${ETH1_IP4} 53
 axfrdns
diff --git a/examples/source/dns-server-udp/run b/examples/source/dns-server-udp/run
index 373ccbc..2086030 100755
--- a/examples/source/dns-server-udp/run
+++ b/examples/source/dns-server-udp/run
@@ -2,7 +2,7 @@
 fdmove -c 2 1
 s6-softlimit -d 300000
 s6-envuidgid dnsserve
-import -i ETH1_IP4
+importas -i ETH1_IP4 ETH1_IP4
 export IP ${ETH1_IP4}
 export ROOT /home/dns
 tinydns
diff --git a/examples/source/fifodir-cleanup/run b/examples/source/fifodir-cleanup/run
index 5a34a9b..a68ed2f 100755
--- a/examples/source/fifodir-cleanup/run
+++ b/examples/source/fifodir-cleanup/run
@@ -3,7 +3,7 @@ fdmove -c 2 1
 if
 {
   forbacktickx -ep -0 i { s6-ls -0 /service }
-  import -u i
+  importas -u i i
   foreground
   {
     if { s6-test -d /service/${i}/log }
diff --git a/examples/source/httpd-4/run b/examples/source/httpd-4/run
index a2e3612..34b2aa6 100755
--- a/examples/source/httpd-4/run
+++ b/examples/source/httpd-4/run
@@ -2,7 +2,7 @@
 fdmove -c 2 1
 s6-envuidgid www
 cd /home/www
-import -ui ETH0_IP4
+importas -ui ETH0_IP4 ETH0_IP4
 fdmove 1 3
 s6-tcpserver4 -v 2 -U -c 512 -1 -- ${ETH0_IP4} 80
 httpd -iv
diff --git a/examples/source/identd-4/run b/examples/source/identd-4/run
index ff7ac3b..eb5ed80 100755
--- a/examples/source/identd-4/run
+++ b/examples/source/identd-4/run
@@ -1,7 +1,7 @@
 #!/command/execlineb -P
 fdmove -c 2 1
 s6-envuidgid ident
-import -ui ETH0_IP4
+importas -ui ETH0_IP4 ETH0_IP4
 fdmove 1 3
 s6-tcpserver4 -v 1 -U -c 512 -1 -- ${ETH0_IP4} 113
 s6-tcpserver-access -Hl0 -t 2000 --
diff --git a/examples/source/init-lan/up b/examples/source/init-lan/up
index 9877c14..b9c63de 100644
--- a/examples/source/init-lan/up
+++ b/examples/source/init-lan/up
@@ -1,8 +1,8 @@
 multisubstitute
 {
-  import -i ETH0_IP4
-  import -i ETH1_IP4
-  import -i ETH2_IP4
+  importas -i ETH0_IP4 ETH0_IP4
+  importas -i ETH1_IP4 ETH1_IP4
+  importas -i ETH2_IP4 ETH2_IP4
 }
 
 if { ifconfig lo 127.0.0.1 netmask 255.0.0.0 }
diff --git a/examples/source/init-sysctl/up b/examples/source/init-sysctl/up
index e3096b6..3159dcf 100644
--- a/examples/source/init-sysctl/up
+++ b/examples/source/init-sysctl/up
@@ -1,6 +1,6 @@
 redirfd -r 0 /etc/sysctl.txt
 forstdin -nCd"\n" -- LINE
-import -u LINE
+importas -u LINE LINE
 multidefine -C $LINE { CTL VALUE }
 redirfd -w 1 /proc/sys/$CTL
 s6-echo -- $VALUE
diff --git a/examples/source/init-wlan0/up b/examples/source/init-wlan0/up
index 26ed7ca..1324c97 100644
--- a/examples/source/init-wlan0/up
+++ b/examples/source/init-wlan0/up
@@ -1,5 +1,5 @@
 foreground { modprobe ath9k blink=1 }
 unexport ?
 if { iw reg set FR }
-import -i WLAN0_IP4
+importas -i WLAN0_IP4 WLAN0_IP4
 ifconfig wlan0 ${WLAN0_IP4} netmask 255.255.255.0
diff --git a/examples/source/mount-cgroups/up b/examples/source/mount-cgroups/up
index 5c62b47..033176f 100644
--- a/examples/source/mount-cgroups/up
+++ b/examples/source/mount-cgroups/up
@@ -5,6 +5,6 @@ pipeline { s6-tail -n +2 }
 pipeline { s6-cut -d"\t" -f1 }
 pipeline { s6-grep -vF -- devices }
 forstdin -d"\n" -- i
-import -u i
+importas -u i i
 if { s6-mkdir /sys/fs/cgroup/${i} }
 s6-mount -t cgroup -o ${i} -- cgroup /sys/fs/cgroup/${i}
diff --git a/examples/source/mount-rwfs/up b/examples/source/mount-rwfs/up
index 50b5116..7a54cda 100644
--- a/examples/source/mount-rwfs/up
+++ b/examples/source/mount-rwfs/up
@@ -1,3 +1,3 @@
 s6-envdir -i /run/disk-devices
-import -i rwfs
+importas -i rwfs rwfs
 s6-mount -wt ext4 -o barrier=0,nodev /dev/${rwfs} /mnt/rwfs
diff --git a/examples/source/mount-swap/down b/examples/source/mount-swap/down
index e0211d6..19c2ed0 100644
--- a/examples/source/mount-swap/down
+++ b/examples/source/mount-swap/down
@@ -1,3 +1,3 @@
 s6-envdir -i /run/disk-devices
-import -i swap
+importas -i swap swap
 s6-swapoff /dev/${swap}
diff --git a/examples/source/mount-swap/up b/examples/source/mount-swap/up
index af17571..2017aee 100644
--- a/examples/source/mount-swap/up
+++ b/examples/source/mount-swap/up
@@ -1,3 +1,3 @@
 s6-envdir -i /run/disk-devices
-import -i swap
+importas -i swap swap
 s6-swapon /dev/${swap}
diff --git a/examples/source/mount-sync/up b/examples/source/mount-sync/up
index 5832a83..fb0bab0 100644
--- a/examples/source/mount-sync/up
+++ b/examples/source/mount-sync/up
@@ -1,3 +1,3 @@
 s6-envdir -i /run/disk-devices
-import -i syncfs
+importas -i syncfs syncfs
 s6-mount -wt ext4 -o barrier=0,sync,nodev,noexec,nosuid /dev/${syncfs} /mnt/syncfs
diff --git a/examples/source/ntpclient/run b/examples/source/ntpclient/run
index be19c56..238580c 100755
--- a/examples/source/ntpclient/run
+++ b/examples/source/ntpclient/run
@@ -11,7 +11,7 @@ if
       pipeline { s6-dnsip4 -t 16000 0.fr.pool.ntp.org }
       s6-head -n 1
     }
-    import -u NTPSERVERIP
+    importas -u NTPSERVERIP NTPSERVERIP
     s6-sntpclock -v 2 $NTPSERVERIP
   }
   s6-clockadd -e 120000
diff --git a/examples/source/qmtpd-4/run b/examples/source/qmtpd-4/run
index 28f6a9a..c18fc4d 100755
--- a/examples/source/qmtpd-4/run
+++ b/examples/source/qmtpd-4/run
@@ -1,7 +1,7 @@
 #!/command/execlineb -P
 fdmove -c 2 1
 s6-envuidgid qmaild
-import -ui ETH0_IP4
+importas -ui ETH0_IP4 ETH0_IP4
 fdmove 1 3
 s6-tcpserver4 -v 1 -U -c 255 -1 -- ${ETH0_IP4} 209
 qmail-qmtpd
diff --git a/examples/source/smtpd-4/run b/examples/source/smtpd-4/run
index 5c7e002..8c1b17c 100755
--- a/examples/source/smtpd-4/run
+++ b/examples/source/smtpd-4/run
@@ -1,7 +1,7 @@
 #!/command/execlineb -P
 fdmove -c 2 1
 s6-envuidgid qmaild
-import -ui ETH0_IP4
+importas -ui ETH0_IP4 ETH0_IP4
 fdmove 1 3
 s6-tcpserver4 -v 2 -U -c 255 -1 -- ${ETH0_IP4} 25
 s6-tcpserver-access -v 2 -w -t 2000 -i data/rules --
diff --git a/examples/source/sshd-4/run b/examples/source/sshd-4/run
index 2667ecf..810ace3 100755
--- a/examples/source/sshd-4/run
+++ b/examples/source/sshd-4/run
@@ -1,6 +1,6 @@
 #!/command/execlineb -P
 fdmove -c 2 1
-import -ui ETH0_IP4
+importas -ui ETH0_IP4 ETH0_IP4
 fdmove 1 3
 s6-tcpserver4 -v 2 -1 -- ${ETH0_IP4} 22
 s6-tcpserver-access -v 2 -DRl0 -t 5000 -i data/rules --
diff --git a/examples/source/taiclockd-4/run b/examples/source/taiclockd-4/run
index fbb970f..168eb9e 100755
--- a/examples/source/taiclockd-4/run
+++ b/examples/source/taiclockd-4/run
@@ -2,5 +2,5 @@
 
 fdmove -c 2 1
 s6-setuidgid tai
-import -i ETH0_IP4
+importas -i ETH0_IP4 EHT0_IP4
 s6-taiclockd -i ${ETH0_IP4}
diff --git a/examples/source/udhcpc-eth3/run b/examples/source/udhcpc-eth3/run
index 8b4650a..9d9f6a5 100755
--- a/examples/source/udhcpc-eth3/run
+++ b/examples/source/udhcpc-eth3/run
@@ -1,5 +1,5 @@
 #!/command/execlineb -P
 fdmove -c 2 1
 s6-envdir -I env
-import -uD 1.2.3.4 IP
+importas -uD 1.2.3.4 IP IP
 udhcpc -f -C -i eth3 -x lease:86400 -r $IP -s /etc/udhcpc/udhcpc-script
diff --git a/examples/source/udhcpd-wlan0/run b/examples/source/udhcpd-wlan0/run
index d64605e..be40c60 100755
--- a/examples/source/udhcpd-wlan0/run
+++ b/examples/source/udhcpd-wlan0/run
@@ -1,4 +1,4 @@
 #!/command/execlineb -P
 fdmove -c 2 1
-import -ui WLAN0_IP4
+importas -ui WLAN0_IP4 WLAN0_IP4
 udhcpd -f -I ${WLAN0_IP4} /etc/udhcpd-wlan0.conf
-- 
cgit v1.2.3