Skip to content

Commit

Permalink
--init=systemd: systemctl --user start dbus #16
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Aug 29, 2019
1 parent 20ff265 commit 818d268
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -4561,6 +4561,12 @@ create_dockerrc() { # create dockerrc: This script runs as root (or
echo ' [ "$Workdir" ] && echo "[ -d \"$Workdir\" ] && cd \"$Workdir\" # WORKDIR in image"'
echo " echo ''"

[ "$Initsystem" = "systemd" ] && {
echo " echo 'systemctl --user start dbus'"
echo " echo 'systemctl --user status dbus'"
echo " echo ''"
}

echo " echo \"debugnote \\\"Running image command: \$Tini \\\$Dbus \$Entrypoint \$Imagecommand\\\"\""
case $Interactive in
no)
Expand Down Expand Up @@ -5807,6 +5813,7 @@ check_host() { # check host environment
case $Winsubsystem in
"")
Hostip="$(ip -4 -o a | grep 'docker0' | awk '{print $4}' | cut -d/ -f1 | grep 172.17.0.1)"
#[ "$Hostip" ] || Hostip="$($Dockerexe network inspect bridge --format='{{.IPAM.Config}}' 2>/dev/null | awk '{print $2}')"
[ "$Hostip" ] || Hostip="$(ip -4 -o a | grep 'docker0' | awk '{print $4}' | cut -d/ -f1 | head -n1)"
[ "$Hostip" ] || Hostip="$(ip -4 -o a | awk '{print $4}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -n1)"
;;
Expand Down

0 comments on commit 818d268

Please sign in to comment.