Skip to content

Commit

Permalink
dockerrc(): do not use --tty in docker exec #290
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Oct 24, 2020
1 parent be863b5 commit 2e869d6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -6036,9 +6036,9 @@ $(tail $Containerlogfile)\""
[ "$Switchcontaineruser" = "no" ] && [ "$Containersetup" = "yes" ] && {
echo "debugnote 'dockerrc(): Starting containerrootrc with privileged docker exec'"
echo "# copy containerrootrc inside of container to avoid possible noexec of host home."
echo "$Dockerexe exec --privileged --tty $Containername sh -c 'cp $(convertpath share $Containerrootrc) /tmp/containerrootrc ; chmod 644 /tmp/containerrootrc' 2>&1 | rmcr >>$Containerlogfile"
echo "$Dockerexe exec --privileged $Containername sh -c 'cp $(convertpath share $Containerrootrc) /tmp/containerrootrc ; chmod 644 /tmp/containerrootrc' 2>&1 | rmcr >>$Containerlogfile"
echo "# run container root setup. containerrc will wait until setup script is ready."
echo "$Dockerexe exec --privileged --tty -u root $Containername /bin/sh /tmp/containerrootrc 2>&1 | rmcr >>$Containerlogfile"
echo "$Dockerexe exec --privileged -u root $Containername /bin/sh /tmp/containerrootrc 2>&1 | rmcr >>$Containerlogfile"
echo ""
}

Expand Down

0 comments on commit 2e869d6

Please sign in to comment.