export LANGUAGE

Signed-off-by: shenmo <jifengshenmo@outlook.com>

README.md

@@ -25,19 +25,14 @@ Please use `git clone --recurse-submodules` to obtain the env
 
 ### Manual Install（Debian/Fedora/Arch)
 
-https://pan.shenmo.tech/index.php?share/folder&user=1&sid=Ye6kyxQE
+https://pan.huang1111.cn/s/jR1GdUy
 
-(Dependencies are needed to upgrade for Ubuntu 18.04/deepin 15)
-
-https://cdn.d.store.deepinos.org.cn/store/depends/bubblewrap_0.3.1-4_amd64.deb   x86
-
-https://cdn.d.store.deepinos.org.cn/aarch64-store/depends/bubblewrap_0.3.1-4_arm64.deb arm64
 
 ### Amber-CE x86
 
 Use LAT to run a x86 bookworm container. Can install x86 debs and run x86 apps 
 
-https://pan.shenmo.tech/index.php?share/folder&user=1&sid=qnJAY5BE
+https://pan.huang1111.cn/s/P63D6Cm
 
 ## Build Guide
 

README.zh.md

@@ -19,17 +19,15 @@
 
 ### 手动安装（Debian/Fedora/Arch)
 
-https://pan.shenmo.tech/index.php?share/folder&user=1&sid=Ye6kyxQE
+https://pan.huang1111.cn/s/jR1GdUy
 
-(Ubuntu 18.04/deepin 15需要先安装依赖)
-
-https://cdn.d.store.deepinos.org.cn/store/depends/bubblewrap_0.3.1-4_amd64.deb   x86
-
-https://cdn.d.store.deepinos.org.cn/aarch64-store/depends/bubblewrap_0.3.1-4_arm64.deb arm64
 
 ### Amber-CE x86
 
-利用 LAT 运行的x86容器，可安装和运行x86的deb  https://pan.shenmo.tech/index.php?share/folder&user=1&sid=qnJAY5BE
+利用 LAT 运行的x86容器，可安装和运行x86的deb  
+
+https://pan.huang1111.cn/s/P63D6Cm
+
 
 ## 构建指南
 

src/DEBIAN/control

@@ -2,7 +2,7 @@ Package: cn.flamescion.bookworm-compatibility-mode
 Version: 12.4.13.1
 Section: misc
 Priority: optional
-Depends: bubblewrap,flatpak,zenity,policykit-1,systemd,procps
+Depends: bubblewrap,flatpak,zenity,policykit-1 | pkexec | polkit-1 | polkit,systemd,procps
 Maintainer: shenmo <shenmo@spark-app.store>
 Architecture: amd64
 Description: bwrap wrapper for install and running debs inside a bookworm container

src/DEBIAN/postinst

@@ -17,8 +17,12 @@ if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
 systemctl daemon-reload
 systemctl enable ace-bookworm-auto-upgrade
 systemctl start ace-bookworm-auto-upgrade
+        # enable kernel.unprivileged_userns_clone
+        # disable kernel.apparmor_restrict_unprivileged_unconfined and kernel.apparmor_restrict_unprivileged_userns
+        if [ -f /usr/lib/sysctl.d/amber-ce.conf ];then
+                sysctl -p /usr/lib/sysctl.d/amber-ce.conf
         fi
 
-systemctl reload apparmor
+fi
 
 true

src/etc/apparmor.d/amber-ce-bookworm

@@ -1,7 +0,0 @@
-abi <abi/4.0>,
-include <tunables/global>
-profile bwrap /usr/bin/bwrap flags=(unconfined) {
-userns,
-#Site-specific additions and overrides. See local/README for details.
-include if exists <local/bwrap>
-}

src/etc/xdg/autostart/bookworm.ace-gxde-fixer.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=bookworm.ace-gxde-fixer
+Name[zh_CN]=bookworm.ace-gxde-fixer
+Comment=bookworm.ace-gxde-fixer
+Type=Application
+Exec=/opt/apps/amber-ce-bookworm/files/bin/bookworm.ace-gxde-fixer
+Icon=amber-ce-bookworm
+Categories=System
+
+# Generated from the DesktopGenerater component of the z-Tools toolkit

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm.ace-gxde-fixer

@@ -0,0 +1,7 @@
+#!/bin/bash
+if [ "$UID" != "0" ];then
+pkexec $0
+exit
+fi
+
+bookworm-run /opt/ace-host-integration/ace-host-integration

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-upgrader/ace-upgrader

@@ -1,5 +1,5 @@
 #!/bin/bash
-LANGUAGE=en_US
+export LANGUAGE=en_US
 
 
 
@@ -93,6 +93,9 @@ fi
 
 # The code above is modified from https://blog.csdn.net/yaxuan88521/article/details/120516298
 
+
+
+
 if [  $(which aptss)  ];then
 APT_COMMAND=aptss
 /usr/bin/apt update

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bookworm-run

@@ -1,3 +1,4 @@
 #!/bin/bash
-### We do not want users to install ACE in ACE. Run inside this container instead
-${@}
+### We do not want users to install ACE in ACE.
+echo "Running ACE in ACE is NOT Tested or recommended. Exit"
+exit 1

src/usr/lib/sysctl.d/amber-ce.conf

@@ -0,0 +1,6 @@
+# ACE app runs in a container, need privileges within user namespace, so we need to set it
+kernel.unprivileged_userns_clone=1
+# Ubuntu 24.04 has more limitation on unprivileged user namespace,so we have to disable them.
+# refer to https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
+kernel.apparmor_restrict_unprivileged_unconfined=0
+kernel.apparmor_restrict_unprivileged_userns=0

src/usr/share/polkit-1/actions/amber-ce-bookworm.ace-gxde-fixer.policy

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+    <vendor>bookworm.ace-gxde-fixer</vendor>
+    <icon_name>x-package-repository</icon_name>
+    <action id="bookworm.ace-gxde-fixer">
+        <description>运行bookworm.ace-gxde-fixer需要权限</description>
+        <message>要使用bookworm.ace-gxde-fixer需要权限</message>
+        <defaults>
+            <allow_any>yes</allow_any>
+            <allow_inactive>yes</allow_inactive>
+            <allow_active>yes</allow_active>
+        </defaults>
+        <annotate key="org.freedesktop.policykit.exec.path">/opt/apps/amber-ce-bookworm/files/bin/bookworm.ace-gxde-fixer</annotate>
+        <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+    </action>
+</policyconfig>
+