Fix kiosk startup: radiantwave binary, drop stale rsync, fix GODEBUG typo
This commit is contained in:
+2
-6
@@ -102,11 +102,7 @@ in
|
|||||||
export WLR_RENDERER=pixman
|
export WLR_RENDERER=pixman
|
||||||
export WLR_NO_HARDWARE_CURSORS=1
|
export WLR_NO_HARDWARE_CURSORS=1
|
||||||
|
|
||||||
# Asset sync + start app
|
exec dbus-run-session cage -- /run/current-system/sw/bin/radiantwave -d -s > /tmp/kiosk.log 2>&1
|
||||||
mkdir -p /home/kiosk/.local/share/radiantwave
|
|
||||||
${pkgs.rsync}/bin/rsync -ru ${radiantApp}/share/radiantwave/ /home/kiosk/.local/share/radiantwave/
|
|
||||||
|
|
||||||
exec dbus-run-session cage -- ${radiantApp}/bin/radiantwave -d -s > /tmp/kiosk.log 2>&1
|
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@@ -176,4 +172,4 @@ in
|
|||||||
echo "Rollback completed at $(date)"
|
echo "Rollback completed at $(date)"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -12,7 +12,7 @@ in
|
|||||||
|
|
||||||
environment.loginShellInit = pkgs.lib.mkForce ''
|
environment.loginShellInit = pkgs.lib.mkForce ''
|
||||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
if [ "$(tty)" = "/dev/tty1" ]; then
|
||||||
export CODEBUG=netdns=cgo
|
export GODEBUG=netdns=cgo
|
||||||
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
||||||
for i in {1..10}; do
|
for i in {1..10}; do
|
||||||
if ${pkgs.iputils}/bin/ping -c 1 8.8.8.8 &> /dev/null; then
|
if ${pkgs.iputils}/bin/ping -c 1 8.8.8.8 &> /dev/null; then
|
||||||
@@ -27,7 +27,6 @@ in
|
|||||||
export WLR_RENDERER=pixman
|
export WLR_RENDERER=pixman
|
||||||
export WLR_NO_HARDWARE_CURSORS=1
|
export WLR_NO_HARDWARE_CURSORS=1
|
||||||
|
|
||||||
mkdir -p /home/kiosk/.local/share/radiantwave
|
|
||||||
exec dbus-run-session cage -- ${kioskscript} > /tmp/kiosk.log 2>&1
|
exec dbus-run-session cage -- ${kioskscript} > /tmp/kiosk.log 2>&1
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|||||||
Reference in New Issue
Block a user