21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
From ae56039cf049fc3753347ff2b641d41592604cab Mon Sep 17 00:00:00 2001
|
|
From: Davide Cavalca <davide@cavalca.name>
|
|
Date: Sun, 13 Jun 2021 18:02:42 -0700
|
|
Subject: [PATCH] Use /usr/bin/tini-static for tini if available
|
|
|
|
---
|
|
x11docker | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/x11docker b/x11docker
|
|
index 068f34d..148a8bb 100755
|
|
--- a/x11docker
|
|
+++ b/x11docker
|
|
@@ -4521,6 +4521,7 @@ setup_initsystem() { # option init: set up capabilities, check or cre
|
|
Tinibinaryfile="$(command -v docker-init ||:)"
|
|
[ -z "$Tinibinaryfile" ] && Tinibinaryfile="/snap/docker/current/bin/docker-init"
|
|
[ -e "$Tinibinaryfile" ] || Tinibinaryfile="/snap/docker/current/usr/bin/docker-init"
|
|
+ [ -e "/usr/bin/tini-static" ] && Tinibinaryfile="/usr/bin/tini-static"
|
|
[ -e "/usr/local/share/x11docker/tini-static" ] && Tinibinaryfile="/usr/local/share/x11docker/tini-static"
|
|
[ -e "$Hostuserhome/.local/share/x11docker/tini-static" ] && Tinibinaryfile="$Hostuserhome/.local/share/x11docker/tini-static"
|
|
Tinibinaryfile="$(myrealpath "$Tinibinaryfile" 2>/dev/null ||:)"
|