diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-22 08:20:22 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-22 08:20:22 +0000 |
| commit | 8286add1116697498fe44b9de347476fa9a33833 (patch) | |
| tree | 13cc627c4bab781c4b2934fbf30c0949660b7184 /layout/rootfs/etc/s6-rc | |
| parent | 0c2dd45bb46a689611bc8c568103c7011ec3ad06 (diff) | |
| download | lh-bootstrap-8286add1116697498fe44b9de347476fa9a33833.tar.xz | |
More import -> importas conversions
Diffstat (limited to 'layout/rootfs/etc/s6-rc')
5 files changed, 12 insertions, 12 deletions
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run index df7669b..a2c371b 100755 --- a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run +++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run @@ -3,7 +3,7 @@ fdmove -c 2 1 if { forbacktickx -p -0 i { s6-ls -0 /run/service } - import -u i + importas -u i s6-cleanfifodir /run/service/${i}/event } s6-setuidgid nobody diff --git a/layout/rootfs/etc/s6-rc/source-base/init-clock/up b/layout/rootfs/etc/s6-rc/source-base/init-clock/up index 43e0c65..1c7f02c 100644 --- a/layout/rootfs/etc/s6-rc/source-base/init-clock/up +++ b/layout/rootfs/etc/s6-rc/source-base/init-clock/up @@ -9,11 +9,11 @@ pipeline foreground { s6-envdir /etc/s6-linux-init/env-stage2 - import -u COUNTRY_CODE + importas -u COUNTRY_CODE COUNTRY_CODE s6-echo ${COUNTRY_CODE} } forx CODE { uk de ru cn kr jp us ca br au il za } - import -u CODE + importas -u CODE CODE s6-echo ${CODE} } @@ -36,9 +36,9 @@ pipeline { s6-setuidgid nobody forstdin -p -d"\n" CODE - import -u CODE + importas -u CODE CODE forx -p I { 0 1 } - import -u I + importas -u I I redirfd -w 2 /dev/null s6-dnsip4 -t 30000 -- ${I}.${CODE}.pool.ntp.org } @@ -52,7 +52,7 @@ pipeline { s6-setuidgid ntp forstdin -p -d"\n" NTPSERVERIP - import -u NTPSERVERIP + importas -u NTPSERVERIP NTPSERVERIP redirfd -w 2 /dev/null s6-sntpclock -f -T 5000 ${NTPSERVERIP} } diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-cgroups-sub/up b/layout/rootfs/etc/s6-rc/source-base/mount-cgroups-sub/up index 94f7c28..0c915da 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-cgroups-sub/up +++ b/layout/rootfs/etc/s6-rc/source-base/mount-cgroups-sub/up @@ -3,7 +3,7 @@ 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 -p /sys/fs/cgroup/${i} } foreground { s6-mount -t cgroup -o ${i} -- cgroup /sys/fs/cgroup/${i} } importas -u ? ? diff --git a/layout/rootfs/etc/s6-rc/source-base/ntpclient/run b/layout/rootfs/etc/s6-rc/source-base/ntpclient/run index 1c1a820..3eebee0 100755 --- a/layout/rootfs/etc/s6-rc/source-base/ntpclient/run +++ b/layout/rootfs/etc/s6-rc/source-base/ntpclient/run @@ -12,9 +12,9 @@ pipeline { s6-setuidgid nobody s6-envdir /etc/s6-linux-init/env-stage2 - import -u COUNTRY_CODE + importas -u COUNTRY_CODE COUNTRY_CODE forx -p I { 0 1 } - import -u I + importas -u I I s6-dnsip4 -t 30000 -- ${I}.${COUNTRY_CODE}.pool.ntp.org } importas -u p1 ! @@ -28,7 +28,7 @@ pipeline { s6-setuidgid ntp forstdin -p -d"\n" NTPSERVERIP - import -u NTPSERVERIP + importas -u NTPSERVERIP NTPSERVERIP s6-sntpclock -T 5000 ${NTPSERVERIP} } importas -u p2 ! diff --git a/layout/rootfs/etc/s6-rc/source-base/static-eth0/up b/layout/rootfs/etc/s6-rc/source-base/static-eth0/up index 2fb37e8..640d66a 100644 --- a/layout/rootfs/etc/s6-rc/source-base/static-eth0/up +++ b/layout/rootfs/etc/s6-rc/source-base/static-eth0/up @@ -1,8 +1,8 @@ s6-envdir /etc/s6-linux-init/env-stage2 multisubstitute { - import -i ETH0_IP4 - import DEFAULT_ROUTER_IP4 + importas -i ETH0_IP4 ETH0_IP4 + importas DEFAULT_ROUTER_IP4 DEFAULT_ROUTER_IP4 } if { ip addr add ${ETH0_IP4}/24 dev eth0 } foreground { ip route del default } |