Ensure symlink dir exists

Signed-off-by: Paulo Gomes <[email protected]>
qubesome · May 14, 2024 · 6e7c7ff · 6e7c7ff
1 parent 073af5a
commit 6e7c7ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/internal/docker/run.go b/internal/docker/run.go
@@ -93,7 +93,7 @@ func Run(ew types.EffectiveWorkload) error {
 	var paths []string
 	if wl.HostAccess.LocalTime {
 		// Mount localtime into container. This file may be a symlink, if so,
-		// mount the unlying file as well.
+		// mount the underlying file as well.
 		file := "/etc/localtime"
 		if _, err := os.Stat(file); err == nil {
 			paths = append(paths, fmt.Sprintf("-v=%[1]s:%[1]s:ro", file))
@@ -139,7 +139,7 @@ func Run(ew types.EffectiveWorkload) error {
 		if err != nil {
 			return err
 		}
-		args = append(args, fmt.Sprintf("-v=%s:/tmp/.Xauthority", pp))
+		args = append(args, fmt.Sprintf("-v=%s:/tmp/.Xauthority:ro", pp))
 		args = append(args, "-e=XAUTHORITY=/tmp/.Xauthority")
 		args = append(args, fmt.Sprintf("-v=/tmp/.X11-unix/X%[1]d:/tmp/.X11-unix/X%[1]d", ew.Profile.Display))
 	}
@@ -156,7 +156,7 @@ func Run(ew types.EffectiveWorkload) error {
 
 		srcMimeList := filepath.Join(pdir, "mimeapps.list")
 		dstMimeList := filepath.Join(homedir, ".local", "share", "applications", "mimeapps.list")
-		err = os.WriteFile(srcMimeList, []byte(mimesList), 0o600)
+		err = os.WriteFile(srcMimeList, []byte(mimesList), files.FileMode)
 		if err != nil {
 			return fmt.Errorf("failed to write mimeapps.list: %w", err)
 		}
@@ -166,7 +166,7 @@ func Run(ew types.EffectiveWorkload) error {
 		srcHandler := filepath.Join(pdir, "mime-handler.desktop")
 		dstHandler := filepath.Join(homedir, ".local", "share", "applications", "qubesome-default-handler.desktop")
 
-		err = os.WriteFile(srcHandler, []byte(defaultMimeHandler), 0o600)
+		err = os.WriteFile(srcHandler, []byte(defaultMimeHandler), files.FileMode)
 		if err != nil {
 			return fmt.Errorf("failed to write mime-handler.desktop: %w", err)
 		}
@@ -192,6 +192,7 @@ func Run(ew types.EffectiveWorkload) error {
 	// Set hostname to be the same as the container name
 	args = append(args, "-h", ew.Name)
 
+	// TODO: what exactly needs to be shared here?
 	if wl.Bluetooth || wl.VarRunUser {
 		args = append(args, "-v=/run/user/1000:/run/user/1000")
 	}

diff --git a/internal/profiles/profiles.go b/internal/profiles/profiles.go
@@ -112,6 +112,11 @@ func StartFromGit(name, gitURL, path string) error {
 		return err
 	}
 
+	err = os.MkdirAll(filepath.Dir(ln), files.DirMode)
+	if err != nil {
+		return err
+	}
+
 	err = os.Symlink(cfgPath, ln)
 	if err != nil {
 		return err