From 18eb44c8c331adc55c9770e5df5a8dbd21c70013 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Mon, 4 Sep 2023 22:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=BE=EF=BC=9Ainit=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DEBIAN/control                                  |  4 ++--
 .../files/bin/bookworm-init                         | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/DEBIAN/control b/src/DEBIAN/control
index e0c19b7..c5b6a34 100755
--- a/src/DEBIAN/control
+++ b/src/DEBIAN/control
@@ -1,8 +1,8 @@
 Package: cn.flamescion.bookworm-compatibility-mode
-Version: 12.1.9
+Version: 12.1.10
 Section: misc
 Priority: optional
 Depends: bubblewrap
 Maintainer: shenmo <shenmo@spark-app.store>
-Architecture: arm64
+Architecture: amd64
 Description: bwrap wrapper for install and running debs inside a bookworm container
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 09548f8..7233797 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
@@ -42,20 +42,20 @@ bwrap --dev-bind $chrootEnvPath/ / \
   --dev-bind /media /media \
   --dev-bind /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 bookworm-compatibility-mode \
   --unshare-uts \
   --dev-bind /etc/resolv.conf /etc/resolv.conf \
   --dev-bind /home /home \
-  bash -c "${container_command}"
+  $@
 
 
 }
@@ -200,7 +200,7 @@ sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ /
   --dev-bind /media /media \
   --dev-bind /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  \
@@ -216,3 +216,4 @@ sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ /
   locale-gen
 
 chown -R $(who | awk '{print $1}' | head -n 1) $chrootEnvPath
+