Skip to content

Commit 5633efc

Browse files
committed
add option to disable interposer
1 parent 0f5cef1 commit 5633efc

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,10 @@ RUN \
201201
echo "**** install selkies fake udev ****" && \
202202
cd ../fake-udev && \
203203
make && \
204+
mkdir /opt/lib && \
204205
mv \
205206
libudev.so.1.0.0-fake \
206-
/usr/lib/ && \
207+
/opt/lib/ && \
207208
echo "**** add icon ****" && \
208209
mkdir -p \
209210
/usr/share/selkies/www && \

Dockerfile.aarch64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,10 @@ RUN \
199199
echo "**** install selkies fake udev ****" && \
200200
cd ../fake-udev && \
201201
make && \
202+
mkdir /opt/lib && \
202203
mv \
203204
libudev.so.1.0.0-fake \
204-
/usr/lib/ && \
205+
/opt/lib/ && \
205206
echo "**** add icon ****" && \
206207
mkdir -p \
207208
/usr/share/selkies/www && \

root/etc/s6-overlay/s6-rc.d/init-selkies-config/run

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ fi
5959

6060

6161
# set env based on vars
62-
#printf "${SELKIES_INTERPOSER}${LD_PRELOAD:+:${LD_PRELOAD}}" > /run/s6/container_environment/LD_PRELOAD
6362
printf "${GST_DEBUG:-*:1}" > /run/s6/container_environment/GST_DEBUG
6463
printf "${SELKIES_ENCODER:-x264enc}" > /run/s6/container_environment/SELKIES_ENCODER
6564
printf "${SELKIES_FRAMERATE:-60}" > /run/s6/container_environment/SELKIES_FRAMERATE
@@ -69,7 +68,10 @@ printf "${DISPLAY_SIZEH:-768}" > /run/s6/container_environment/DISPLAY_SIZEH
6968
printf "${DISPLAY_REFRESH:60}" > /run/s6/container_environment/DISPLAY_REFRESH
7069
printf "${DISPLAY_DPI:-96}" > /run/s6/container_environment/DISPLAY_DPI
7170
printf "${DISPLAY_CDEPTH:-24}" > /run/s6/container_environment/DISPLAY_CDEPTH
72-
printf "/usr/lib/selkies_joystick_interposer.so:/usr/lib/libudev.so.1.0.0-fake" > /run/s6/container_environment/LD_PRELOAD
71+
if [[ -z ${NO_GAMEPAD+x} ]]; then
72+
printf "/usr/lib/selkies_joystick_interposer.so:/opt/lib/libudev.so.1.0.0-fake" > /run/s6/container_environment/LD_PRELOAD
73+
fi
74+
7375
# JS folder setup
7476
mkdir -pm1777 /dev/input
7577
touch /tmp/selkies_js.log

0 commit comments

Comments
 (0)