Skip to content

Commit 98a4d79

Browse files
committed
Fix up desktops in container
1 parent 87cb163 commit 98a4d79

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

config/modulefiles/gentoo/2024.04.lua

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ prepend_path("MANPATH", pathJoin(root, "usr/share/man"))
2727
prepend_path("MANPATH", pathJoin(root, "usr/local/share/man"))
2828
prepend_path("MANPATH", pathJoin(root, "usr/share/binutils-data", os_data_path, "2.42/man"))
2929
prepend_path("MANPATH", pathJoin(root, "usr/share/gcc-data", os_data_path, "11/man"))
30+
prepend_path("XDG_DATA_DIRS", pathJoin(root, "usr/share"))

start-container.sh

+4
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ if [ -d "/etc/glvnd" ]; then
148148
SINGULARITY_BIND="${SINGULARITY_BIND},/etc/glvnd:/etc/glvnd:rw"
149149
fi
150150

151+
if [ -f "/usr/share/baselayout/flatcar-profile.sh" ]; then
152+
SINGULARITY_BIND="${SINGULARITY_BIND},${PWD}/config/profile/bash.sh:/usr/share/baselayout/flatcar-profile.sh:ro"
153+
fi
154+
151155
if [ -d "${HOME}/testsuite/sanitarium" ]; then
152156
SINGULARITY_BIND="${SINGULARITY_BIND},${HOME}/testsuite:/home/${USER}/testsuite:rw"
153157
fi

xfce.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ fi
4141
eval $(dbus-launch --sh-syntax)
4242

4343
# Start up xfce desktop (block until user logs out of desktop)
44-
xfce4-session
44+
startxfce4

0 commit comments

Comments
 (0)