Fabio/qemu-arm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Shared memory path (#378)

Browse source
This commit is contained in:
Kroese 2024-01-23 03:22:40 +01:00 committed by GitHub
parent cc952a81c1
commit 4a0dbc6c06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/boot.sh
View file

@ -60,9 +60,9 @@ if [[ "${BOOT_MODE,,}" != "legacy" ]]; then
if [[ "$TPM" == [Yy1]* ]]; then if [[ "$TPM" == [Yy1]* ]]; then
mkdir -p /dev/shm/tpm mkdir -p /run/shm/tpm
chmod 755 /dev/shm/tpm chmod 755 /run/shm/tpm
swtpm socket -t -d --tpmstate dir=/dev/shm/tpm --ctrl type=unixio,path=/run/swtpm-sock --tpm2 swtpm socket -t -d --tpmstate dir=/run/shm/tpm --ctrl type=unixio,path=/run/swtpm-sock --tpm2
for (( i = 1; i < 50; i++ )); do for (( i = 1; i < 50; i++ )); do

6
src/config.sh
View file

@ -16,8 +16,10 @@ ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $DISPLAY_OPTS $MON_OPTS $SERIAL_OP
ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ') ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
if [[ "${DISPLAY,,}" == "web" ]]; then if [[ "${DISPLAY,,}" == "web" ]]; then
rm -f /dev/shm/msg.html [ ! -f "$INFO" ] && error "File $INFO not found?!"
rm -f /dev/shm/index.html rm -f "$INFO"
[ ! -f "$PAGE" ] && error "File $PAGE not found?!"
rm -f "$PAGE"
else else
if [[ "${DISPLAY,,}" == "vnc" ]]; then if [[ "${DISPLAY,,}" == "vnc" ]]; then
html "You can now connect to VNC on port 5900." "0" html "You can now connect to VNC on port 5900." "0"

6
src/reset.sh
View file

@ -28,8 +28,8 @@ echo
# Helper variables # Helper variables
STORAGE="/storage" STORAGE="/storage"
INFO="/dev/shm/msg.html" INFO="/run/shm/msg.html"
PAGE="/dev/shm/index.html" PAGE="/run/shm/index.html"
TEMPLATE="/var/www/index.html" TEMPLATE="/var/www/index.html"
FOOTER1="$APP for Docker v$(</run/version)" FOOTER1="$APP for Docker v$(</run/version)"
FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>" FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
@ -113,7 +113,7 @@ addPackage () {
} }
# Start webserver # Start webserver
cp -r /var/www/* /dev/shm cp -r /var/www/* /run/shm
html "Starting $APP for Docker..." html "Starting $APP for Docker..."
nginx -e stderr nginx -e stderr

4
web/nginx.conf
View file

@ -27,9 +27,9 @@ server {
location / { location / {
root /dev/shm; root /run/shm;
if ( -f /dev/shm/index.html) { if ( -f /run/shm/index.html) {
break; break;
} }