PeterCxy/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: PeterCxy:4c18c58c6d7efa795b30af1d0c34bdbc59955647
Branches Tags
PeterCxy:master
PeterCxy:uconsole
..
compare: PeterCxy:440a00ce165f678448f5dfac10431e4abb86451a
Branches Tags
PeterCxy:uconsole
PeterCxy:master

No commits in common. "4c18c58c6d7efa795b30af1d0c34bdbc59955647" and "440a00ce165f678448f5dfac10431e4abb86451a" have entirely different histories.
4c18c58c6d ... 440a00ce16

1 changed files with 2 additions and 7 deletions
Show stats Expand all files Collapse all files

9
app_containers/.local/bin/run_app_container
View file

@ -32,12 +32,9 @@ fi
if [[ -n $PULSE_SERVER ]]; then # remove prefix if [[ -n $PULSE_SERVER ]]; then # remove prefix
host_pulse=${PULSE_SERVER#unix:} host_pulse=${PULSE_SERVER#unix:}
else # default guess else # default guess
host_pulse=$XDG_RUNTIME_DIR/pulse/native host_pulse=$XDG_RUNTIME_DIR/pulse
fi fi
[ -S $host_pulse ] || die "PulseAudio UNIX socket not found"
mkdir $container_xdg_runtime/pulse
# Default username (assume `user` always has the same uid as the host user) # Default username (assume `user` always has the same uid as the host user)
run_as=user run_as=user
homedir=/home/user homedir=/home/user
@ -47,8 +44,6 @@ if [ "$CONTAINER_RUN_AS_ROOT" = true ]; then
fi fi
SUDO_ASKPASS=$HOME/.local/bin/askpass-bemenu sudo -A systemd-nspawn -M $CONTAINER_NAME \ SUDO_ASKPASS=$HOME/.local/bin/askpass-bemenu sudo -A systemd-nspawn -M $CONTAINER_NAME \
`# This doesn't provide userns isolation, but it does provide capability isolation` \
--private-users=identity \
`# DNS (when containers do not have their own netns)` \ `# DNS (when containers do not have their own netns)` \
--bind-ro=/run/systemd/resolve/stub-resolv.conf:/etc/resolv.conf \ --bind-ro=/run/systemd/resolve/stub-resolv.conf:/etc/resolv.conf \
`# GPU` \ `# GPU` \
@ -67,7 +62,7 @@ SUDO_ASKPASS=$HOME/.local/bin/askpass-bemenu sudo -A systemd-nspawn -M $CONTAINE
--bind-ro=$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY:/run/host/$WAYLAND_DISPLAY \ --bind-ro=$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY:/run/host/$WAYLAND_DISPLAY \
--setenv=WAYLAND_DISPLAY=$WAYLAND_DISPLAY \ --setenv=WAYLAND_DISPLAY=$WAYLAND_DISPLAY \
`# PulseAudio` \ `# PulseAudio` \
--bind-ro=$host_pulse:/run/host/pulse/native \ --bind-ro=$host_pulse:/run/host/pulse \
--setenv=PULSE_SERVER=unix:/run/host/pulse/native \ --setenv=PULSE_SERVER=unix:/run/host/pulse/native \
`# DBus` \ `# DBus` \
--bind-ro=$host_bus:/run/host/bus \ --bind-ro=$host_bus:/run/host/bus \