Fix running of GUI apps from toolboxes

src/cmd/initContainer.go

@@ -33,6 +33,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
+type initContainerMount struct {
+	containerPath string
+	source        string
+	flags         string
+}
+
+type initContainerSymlink struct {
+	containerPath string
+	source        string
+	folder        bool
+}
+
 var (
 	initContainerFlags struct {
 		home        string
@@ -45,18 +57,22 @@ var (
 		user        string
 	}
 
-	initContainerMounts = []struct {
-		containerPath string
-		source        string
-		flags         string
-	}{
+	initContainerMounts = []initContainerMount{
 		{"/etc/machine-id", "/run/host/etc/machine-id", "ro"},
 		{"/run/libvirt", "/run/host/run/libvirt", ""},
 		{"/run/systemd/journal", "/run/host/run/systemd/journal", ""},
 		{"/var/lib/flatpak", "/run/host/var/lib/flatpak", "ro"},
 		{"/var/log/journal", "/run/host/var/log/journal", "ro"},
 		{"/var/mnt", "/run/host/var/mnt", "rslave"},
 	}
+
+	initContainerX11Symlinks = []initContainerSymlink{
+		{"/tmp/.X11-unix", "/run/host/tmp/.X11-unix", true},
+		{"/tmp/.ICE-unix", "/run/host/tmp/.ICE-unix", true},
+		{"/tmp/.font-unix", "/run/host/tmp/.font-unix", true},
+		{"/tmp/.Test-unix", "/run/host/tmp/.Test-unix", true},
+		{"/tmp/.XIM-unix", "/run/host/tmp/.XIM-unix", true},
+	}
 )
 
 var initContainerCmd = &cobra.Command{
@@ -153,6 +169,12 @@ func initContainer(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to mount tmpfs at /tmp: %s", err)
 	}
 
+	if utils.PathExists("/run/host/tmp") {
+		if err := setupX11(); err != nil {
+			return fmt.Errorf("Failed to set up hosts X environment: %w", err)
+		}
+	}
+
 	if initContainerFlags.monitorHost {
 		logrus.Debug("Monitoring host")
 
@@ -416,6 +438,36 @@ func configureUsers(targetUserUid int,
 	return nil
 }
 
+func setupX11() error {
+	var err error
+
+	logrus.Info("Setting up the host's X environment")
+
+	hostX11LockFiles, err := filepath.Glob("/run/host/tmp/.X*-lock")
+	if err != nil {
+		return err
+	}
+
+	for _, hostX11Lockfile := range hostX11LockFiles {
+		containerX11Lockfile := filepath.Join("/", "tmp", filepath.Base(hostX11Lockfile))
+		initContainerX11Symlinks = append(initContainerX11Symlinks, initContainerSymlink{
+			containerX11Lockfile,
+			hostX11Lockfile,
+			false})
+	}
+
+	for _, symlink := range initContainerX11Symlinks {
+		if _, err = os.Readlink(symlink.containerPath); err != nil {
+			if err = redirectPath(symlink.containerPath,
+				symlink.source,
+				symlink.folder); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func mountBind(containerPath, source, flags string) error {
 	fi, err := os.Stat(source)
 	if err != nil {
@@ -494,12 +546,14 @@ func redirectPath(containerPath, target string, folder bool) error {
 	logrus.Debugf("Preparing to redirect %s to %s", containerPath, target)
 	targetSanitized := sanitizeRedirectionTarget(target)
 
-	err := os.Remove(containerPath)
-	if folder {
-		if err != nil {
+	if utils.PathExists(containerPath) {
+		err := os.Remove(containerPath)
+		if err != nil && folder {
 			return fmt.Errorf("failed to redirect %s to %s: %w", containerPath, target, err)
 		}
+	}
 
+	if folder {
 		if err := os.MkdirAll(target, 0755); err != nil {
 			return fmt.Errorf("failed to redirect %s to %s: %w", containerPath, target, err)
 		}