Add missing env variables
These are required for the internal docker containers
This commit is contained in:
@@ -9,13 +9,12 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
|
||||
sed -i 's|^; flat-volumes.*$|flat-volumes = yes|' /etc/pulse/daemon.conf
|
||||
else
|
||||
echo "Configure pulseaudio to pipe audio to a socket"
|
||||
mkdir -p /tmp/pulse
|
||||
chmod -R a+rw /tmp/pulse
|
||||
mkdir -p ${PULSE_SOCKET_DIR}
|
||||
chmod -R a+rw ${PULSE_SOCKET_DIR}
|
||||
|
||||
# Configure the palse audio socket
|
||||
export PULSE_SERVER=${PULSE_SERVER:-unix:/tmp/pulse/pulse-socket}
|
||||
sed -i "s|^; default-server.*$|default-server = ${PULSE_SERVER}|" /etc/pulse/client.conf
|
||||
sed -i 's|^load-module module-native-protocol-unix.*$|load-module module-native-protocol-unix socket=/tmp/pulse/pulse-socket auth-anonymous=1|' \
|
||||
sed -i 's|^load-module module-native-protocol-unix.*$|load-module module-native-protocol-unix socket=${PULSE_SOCKET_DIR}/pulse-socket auth-anonymous=1|' \
|
||||
/etc/pulse/default.pa
|
||||
|
||||
# Disable pulseaudio from respawning (https://unix.stackexchange.com/questions/204522/how-does-pulseaudio-start)
|
||||
|
||||
@@ -50,10 +50,10 @@ function configure_x_server {
|
||||
rm -f /etc/X11/xorg.conf
|
||||
|
||||
# Ensure the X socket path exists
|
||||
mkdir -p /tmp/.X11-unix
|
||||
mkdir -p ${XORG_SOCKET_DIR}
|
||||
|
||||
# Clear out old lock files
|
||||
display_file=/tmp/.X11-unix/X${DISPLAY#:}
|
||||
display_file=${XORG_SOCKET_DIR}/X${DISPLAY#:}
|
||||
if [ -S ${display_file} ]; then
|
||||
echo "Removing ${display_file} before starting"
|
||||
rm -f /tmp/.X${DISPLAY#:}-lock
|
||||
|
||||
Reference in New Issue
Block a user