Skip to content

Commit 11449db

Browse files
Drop parallel
Remove the dependency on parallel for two commands
1 parent f5eab55 commit 11449db

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

image/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ RUN --mount=type=tmpfs,target=/var/log \
7373
apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg sudo curl fping locales \
7474
ca-certificates rsync \
7575
pkg-config patch \
76-
gawk parallel \
76+
gawk \
7777
anacron wget \
7878
psmisc whois brotli \
7979
pngcrush pngquant ripgrep poppler-utils \

image/base/sbin/boot

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@
55
shutdown() {
66
echo Shutting Down
77
/etc/runit/3
8-
ls /etc/service | SHELL=/bin/sh parallel sv force-stop {}
8+
ls /etc/service | xargs sv force-stop
99
kill -HUP $RUNSVDIR
1010
wait $RUNSVDIR
1111

1212
# give stuff a bit of time to finish
1313
sleep 0.1
1414

1515
ORPHANS=`ps -eo pid | grep -v PID | tr -d ' ' | grep -v '^1$'`
16-
SHELL=/bin/bash parallel 'timeout 5 /bin/bash -c "kill {} && wait {}" || kill -9 {}' ::: $ORPHANS 2> /dev/null
16+
for pid in $ORPHANS; do
17+
(timeout 5 /bin/bash -c "kill $pid && wait $pid" 2>/dev/null || kill -9 $pid 2>/dev/null) &
18+
done
19+
wait
1720
exit
1821
}
1922

0 commit comments

Comments
 (0)