Skip to content

Commit 3e93e7d

Browse files
committed
fix openbox restarts or replac
1 parent 1fce8da commit 3e93e7d

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,9 @@ RUN \
229229
-e 's|</keyboard>| <keybind key="C-S-d"><action name="ToggleDecorations"/></keybind>\n</keyboard>|' \
230230
-e 's|<number>4</number>|<number>1</number>|' \
231231
/etc/xdg/openbox/rc.xml && \
232+
sed -i \
233+
's/--startup/--replace --startup/g' \
234+
/usr/bin/openbox-session && \
232235
echo "**** user perms ****" && \
233236
sed -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \
234237
-i /etc/sudoers && \

Dockerfile.aarch64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ RUN \
227227
-e 's|</keyboard>| <keybind key="C-S-d"><action name="ToggleDecorations"/></keybind>\n</keyboard>|' \
228228
-e 's|<number>4</number>|<number>1</number>|' \
229229
/etc/xdg/openbox/rc.xml && \
230+
sed -i \
231+
's/--startup/--replace --startup/g' \
232+
/usr/bin/openbox-session && \
230233
echo "**** user perms ****" && \
231234
sed -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \
232235
-i /etc/sudoers && \

root/etc/s6-overlay/s6-rc.d/svc-de/run

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ while true; do
99
done
1010

1111
# set sane resolution before starting apps
12-
s6-setuidgid abc xrandr --newmode "1024x768" 63.50 1024 1072 1176 1328 768 771 775 798 -hsync +vsync
13-
s6-setuidgid abc xrandr --addmode screen "1024x768"
14-
s6-setuidgid abc xrandr --output screen --mode "1024x768" --dpi 96
12+
if ! s6-setuidgid abc xrandr | grep -q "1024x768"; then
13+
s6-setuidgid abc xrandr --newmode "1024x768" 63.50 1024 1072 1176 1328 768 771 775 798 -hsync +vsync
14+
s6-setuidgid abc xrandr --addmode screen "1024x768"
15+
s6-setuidgid abc xrandr --output screen --mode "1024x768" --dpi 96
16+
fi
1517

1618
# set xresources
1719
if [ -f "${HOME}/.Xresources" ]; then

0 commit comments

Comments
 (0)