From cd37e0d39686a5546e64a2ec5b7a17326bf0a9ee Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 4 Feb 2026 20:24:03 +0800 Subject: [PATCH] bookworm update --- debian/changelog | 3 ++- src/opt/apps/@PKG_NAME@/files/bin/ace-run | 7 +++++-- src/opt/apps/@PKG_NAME@/files/bin/ace-run-bwrap | 11 ++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2e16824..7f4c776 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -amber-ce-bookworm (12.9.2) UNRELEASED; urgency=low +amber-ce-bookworm (12.9.6) UNRELEASED; urgency=low * 通用 ACE 构建,现不再需要单独使用构建脚本 * 更方便地更改成其他ACE * 现可在容器内使用 dpkg-buildpackage @@ -6,6 +6,7 @@ amber-ce-bookworm (12.9.2) UNRELEASED; urgency=low * 自动添加 X-AMBER-CE-DESKTOP-NAME * 修复更新时的递归问题 * 修复 Nvidia 显卡直通问题 + * 修复 部分应用丢失部分 xprop 信息的问题 -- shenmo Wed, 25 Sep 2024 23:15:49 +0800 diff --git a/src/opt/apps/@PKG_NAME@/files/bin/ace-run b/src/opt/apps/@PKG_NAME@/files/bin/ace-run index 325c1f8..e327304 100755 --- a/src/opt/apps/@PKG_NAME@/files/bin/ace-run +++ b/src/opt/apps/@PKG_NAME@/files/bin/ace-run @@ -1,5 +1,10 @@ #!/bin/bash +bash(){ +/usr/bin/bash --rcfile <(cat ~/.bashrc; echo "PS1=\"\[\e[37;40m\][\[\e[32;40m\]\u\[\e[37;40m\]@@HOST_NAME@ \[\e[36;40m\]\w\[\e[0m\]]\\\$ \"") $@ +} +export -f bash + curdir=`realpath $0` parent_dir=`dirname $curdir` pparent_dir=`dirname $parent_dir` @@ -116,8 +121,6 @@ BIND_DIRS=( "--dev-bind-try /home /home" ) EXTRA_ARGS=( - "--hostname @HOST_NAME@" - "--unshare-uts" "--cap-add CAP_SYS_ADMIN" ) diff --git a/src/opt/apps/@PKG_NAME@/files/bin/ace-run-bwrap b/src/opt/apps/@PKG_NAME@/files/bin/ace-run-bwrap index 3dbe66f..97aff0e 100755 --- a/src/opt/apps/@PKG_NAME@/files/bin/ace-run-bwrap +++ b/src/opt/apps/@PKG_NAME@/files/bin/ace-run-bwrap @@ -1,5 +1,10 @@ #!/bin/bash +bash(){ +/usr/bin/bash --rcfile <(cat ~/.bashrc; echo "PS1=\"\[\e[37;40m\][\[\e[32;40m\]\u\[\e[37;40m\]@@HOST_NAME@ \[\e[36;40m\]\w\[\e[0m\]]\\\$ \"") $@ +} +export -f bash + curdir=`realpath $0` parent_dir=`dirname $curdir` pparent_dir=`dirname $parent_dir` @@ -116,8 +121,6 @@ BIND_DIRS=( "--dev-bind-try /home /home" ) EXTRA_ARGS=( - "--hostname @HOST_NAME@" - "--unshare-uts" # "--cap-add CAP_SYS_ADMIN" ) @@ -143,10 +146,8 @@ for var in "${EXTRA_SCRIPTS[@]}"; do $var done - - # 添加最终的 bash 命令 -add_command "bash -c \"/usr/bin/bwrap ${container_command}\"" +add_command "bash -c \"${container_command}\"" # 输出完整的 EXEC_COMMAND 以查看 # echo "${EXEC_COMMAND}"