From 98575a442cd16aef1f66d5fa603d63c9844a9e49 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 21 Nov 2023 15:26:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Amedia=E6=8C=82?= =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/bin/bookworm-init | 24 +++++++++---------- .../files/bin/bookworm-run | 16 ++++++------- .../files/bin/bookworm-run-root | 16 ++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init index 8028de1..84eb21a 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init +++ b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init @@ -38,8 +38,8 @@ bwrap --dev-bind $chrootEnvPath/ / \ --setenv PATH /flamescion-container-tools/bin-override:$PATH \ --setenv IS_ACE_ENV "1" \ --dev-bind $chrootEnvPath/ / \ - --dev-bind /media /media \ - --dev-bind /tmp /tmp \ + --dev-bind-try /media /media \ + --dev-bind-try /tmp /tmp \ --dev /dev \ --dev-bind-try /dev/dri /dev/dri \ --proc /proc \ @@ -52,8 +52,8 @@ bwrap --dev-bind $chrootEnvPath/ / \ --bind-try /usr/share/fonts /usr/local/share/fonts \ --hostname Amber-CE-Bookworm \ --unshare-uts \ - --dev-bind /etc/resolv.conf /etc/resolv.conf \ - --dev-bind /home /home \ + --dev-bind-try /etc/resolv.conf /etc/resolv.conf \ + --dev-bind-try /home /home \ $@ @@ -205,14 +205,14 @@ sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ / --setenv LC_MONETARY "$LC_MONETARY" \ --setenv LC_MESSAGES "$LC_MESSAGES" \ --setenv LC_NUMERIC "$LC_NUMERIC" \ - --setenv IS_ACE_ENV "1" \ --setenv LC_TIME "$LC_TIME" \ --setenv LC_ALL "$LC_ALL" \ --setenv PULSE_SERVER /run/user/$uid/pulse/native \ --setenv PATH /flamescion-container-tools/bin-override:$PATH \ + --setenv IS_ACE_ENV "1" \ --dev-bind $chrootEnvPath/ / \ - --dev-bind /media /media \ - --dev-bind /tmp /tmp \ + --dev-bind-try /media /media \ + --dev-bind-try /tmp /tmp \ --dev /dev \ --dev-bind-try /dev/dri /dev/dri \ --proc /proc \ @@ -220,13 +220,13 @@ sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ / --dev-bind /run /run \ --dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \ --dev-bind / /host \ - --ro-bind /usr/share/themes /usr/local/share/themes \ - --ro-bind /usr/share/icons /usr/local/share/icons \ - --ro-bind /usr/share/fonts /usr/local/share/fonts \ + --bind-try /usr/share/themes /usr/local/share/themes \ + --bind-try /usr/share/icons /usr/local/share/icons \ + --bind-try /usr/share/fonts /usr/local/share/fonts \ --hostname Amber-CE-Bookworm \ --unshare-uts \ - --dev-bind /etc/resolv.conf /etc/resolv.conf \ - --dev-bind /home /home \ + --dev-bind-try /etc/resolv.conf /etc/resolv.conf \ + --dev-bind-try /home /home \ locale-gen chown -R root $chrootEnvPath diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run index 4be39d9..c14193a 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run +++ b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run @@ -56,23 +56,23 @@ bwrap --dev-bind / / \ --setenv PATH /flamescion-container-tools/bin-override:$PATH \ --setenv IS_ACE_ENV "1" \ --dev-bind $chrootEnvPath/ / \ - --dev-bind /media /media \ - --dev-bind /tmp /tmp \ + --dev-bind-try /media /media \ + --dev-bind-try /tmp /tmp \ --dev /dev \ - --dev-bind /dev/dri /dev/dri \ + --dev-bind-try /dev/dri /dev/dri \ --proc /proc \ --dev-bind /sys /sys \ --dev-bind /run /run \ --dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \ --dev-bind / /host \ - --ro-bind /usr/share/themes /usr/local/share/themes \ - --ro-bind /usr/share/icons /usr/share/icons \ - --ro-bind /usr/share/fonts /usr/local/share/fonts \ + --bind-try /usr/share/themes /usr/local/share/themes \ + --bind-try /usr/share/icons /usr/local/share/icons \ + --bind-try /usr/share/fonts /usr/local/share/fonts \ --hostname Amber-CE-Bookworm \ --unshare-uts \ - --dev-bind /etc/resolv.conf /etc/resolv.conf \ + --dev-bind-try /etc/resolv.conf /etc/resolv.conf \ --cap-add CAP_SYS_ADMIN \ - --dev-bind /home /home \ + --dev-bind-try /home /home \ bash -c "${container_command}" diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-root b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-root index 9d62824..7a81a20 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-root +++ b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-root @@ -55,23 +55,23 @@ bwrap --dev-bind / / \ --setenv PATH /flamescion-container-tools/bin-override:$PATH \ --setenv IS_ACE_ENV "1" \ --dev-bind $chrootEnvPath/ / \ - --dev-bind /media /media \ - --dev-bind /tmp /tmp \ + --dev-bind-try /media /media \ + --dev-bind-try /tmp /tmp \ --dev /dev \ - --dev-bind /dev/dri /dev/dri \ + --dev-bind-try /dev/dri /dev/dri \ --proc /proc \ --dev-bind /sys /sys \ --dev-bind /run /run \ --dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \ --dev-bind / /host \ - --ro-bind /usr/share/themes /usr/local/share/themes \ - --ro-bind /usr/share/icons /usr/local/share/icons \ - --ro-bind /usr/share/fonts /usr/local/share/fonts \ + --bind-try /usr/share/themes /usr/local/share/themes \ + --bind-try /usr/share/icons /usr/local/share/icons \ + --bind-try /usr/share/fonts /usr/local/share/fonts \ --hostname Amber-CE-Bookworm \ --unshare-uts \ - --dev-bind /etc/resolv.conf /etc/resolv.conf \ + --dev-bind-try /etc/resolv.conf /etc/resolv.conf \ --cap-add CAP_SYS_ADMIN \ - --dev-bind /home /home \ + --dev-bind-try /home /home \ bash -c "${container_command}"