File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ dnf install -y iptables"
156156 fi
157157
158158 # ip_tables module dependency check
159- if [ -z " $SKIP_IPTABLES " ] && ! lsmod | grep ip_tables > /dev/null 2>&1 && ! cat /lib/modules/$( uname -r) /modules.builtin | grep ip_tables > /dev/null 2>&1 ; then
159+ if [ -z " $SKIP_IPTABLES " ] && ! lsmod | grep ip_tables > /dev/null 2>&1 && ! grep -q ip_tables " /lib/modules/$( uname -r) /modules.builtin" ; then
160160 INSTRUCTIONS=" ${INSTRUCTIONS}
161161modprobe ip_tables"
162162 fi
@@ -225,11 +225,13 @@ exec_setuptool() {
225225}
226226
227227do_install () {
228+ echo " # Executing docker rootless install script, commit: $SCRIPT_COMMIT_SHA "
229+
228230 init_vars
229231 checks
230232
231233 tmp=$( mktemp -d)
232- trap " rm -rf $tmp " EXIT INT TERM
234+ trap ' rm -rf " $tmp"' EXIT INT TERM
233235 # Download tarballs docker-* and docker-rootless-extras=*
234236 (
235237 cd " $tmp "
You can’t perform that action at this time.
0 commit comments