spark-store-project/amber-ce-bookworm
14
0
Fork 0
mirror of https://gitee.com/amber-ce/amber-ce-bookworm.git synced 2025-07-14 09:32:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复：media挂不上去

Browse Source
This commit is contained in:
shenmo 2023-11-21 15:26:32 +08:00
parent ddabb804d0
commit 98575a442c
3 changed files with 28 additions and 28 deletions
src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin
bookworm-initbookworm-runbookworm-run-root

24
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 PATH /flamescion-container-tools/bin-override:$PATH \
--setenv IS_ACE_ENV "1" \ --setenv IS_ACE_ENV "1" \
--dev-bind $chrootEnvPath/ / \ --dev-bind $chrootEnvPath/ / \
--dev-bind /media /media \ --dev-bind-try /media /media \
--dev-bind /tmp /tmp \ --dev-bind-try /tmp /tmp \
--dev /dev \ --dev /dev \
--dev-bind-try /dev/dri /dev/dri \ --dev-bind-try /dev/dri /dev/dri \
--proc /proc \ --proc /proc \
@ -52,8 +52,8 @@ bwrap --dev-bind $chrootEnvPath/ / \
--bind-try /usr/share/fonts /usr/local/share/fonts \ --bind-try /usr/share/fonts /usr/local/share/fonts \
--hostname Amber-CE-Bookworm \ --hostname Amber-CE-Bookworm \
--unshare-uts \ --unshare-uts \
--dev-bind /etc/resolv.conf /etc/resolv.conf \ --dev-bind-try /etc/resolv.conf /etc/resolv.conf \
--dev-bind /home /home \ --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_MONETARY "$LC_MONETARY" \
--setenv LC_MESSAGES "$LC_MESSAGES" \ --setenv LC_MESSAGES "$LC_MESSAGES" \
--setenv LC_NUMERIC "$LC_NUMERIC" \ --setenv LC_NUMERIC "$LC_NUMERIC" \
--setenv IS_ACE_ENV "1" \
--setenv LC_TIME "$LC_TIME" \ --setenv LC_TIME "$LC_TIME" \
--setenv LC_ALL "$LC_ALL" \ --setenv LC_ALL "$LC_ALL" \
--setenv PULSE_SERVER /run/user/$uid/pulse/native \ --setenv PULSE_SERVER /run/user/$uid/pulse/native \
--setenv PATH /flamescion-container-tools/bin-override:$PATH \ --setenv PATH /flamescion-container-tools/bin-override:$PATH \
--setenv IS_ACE_ENV "1" \
--dev-bind $chrootEnvPath/ / \ --dev-bind $chrootEnvPath/ / \
--dev-bind /media /media \ --dev-bind-try /media /media \
--dev-bind /tmp /tmp \ --dev-bind-try /tmp /tmp \
--dev /dev \ --dev /dev \
--dev-bind-try /dev/dri /dev/dri \ --dev-bind-try /dev/dri /dev/dri \
--proc /proc \ --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 /run /run \
--dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \ --dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \
--dev-bind / /host \ --dev-bind / /host \
--ro-bind /usr/share/themes /usr/local/share/themes \ --bind-try /usr/share/themes /usr/local/share/themes \
--ro-bind /usr/share/icons /usr/local/share/icons \ --bind-try /usr/share/icons /usr/local/share/icons \
--ro-bind /usr/share/fonts /usr/local/share/fonts \ --bind-try /usr/share/fonts /usr/local/share/fonts \
--hostname Amber-CE-Bookworm \ --hostname Amber-CE-Bookworm \
--unshare-uts \ --unshare-uts \
--dev-bind /etc/resolv.conf /etc/resolv.conf \ --dev-bind-try /etc/resolv.conf /etc/resolv.conf \
--dev-bind /home /home \ --dev-bind-try /home /home \
locale-gen locale-gen
chown -R root $chrootEnvPath chown -R root $chrootEnvPath

16
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 PATH /flamescion-container-tools/bin-override:$PATH \
--setenv IS_ACE_ENV "1" \ --setenv IS_ACE_ENV "1" \
--dev-bind $chrootEnvPath/ / \ --dev-bind $chrootEnvPath/ / \
--dev-bind /media /media \ --dev-bind-try /media /media \
--dev-bind /tmp /tmp \ --dev-bind-try /tmp /tmp \
--dev /dev \ --dev /dev \
--dev-bind /dev/dri /dev/dri \ --dev-bind-try /dev/dri /dev/dri \
--proc /proc \ --proc /proc \
--dev-bind /sys /sys \ --dev-bind /sys /sys \
--dev-bind /run /run \ --dev-bind /run /run \
--dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \ --dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \
--dev-bind / /host \ --dev-bind / /host \
--ro-bind /usr/share/themes /usr/local/share/themes \ --bind-try /usr/share/themes /usr/local/share/themes \
--ro-bind /usr/share/icons /usr/share/icons \ --bind-try /usr/share/icons /usr/local/share/icons \
--ro-bind /usr/share/fonts /usr/local/share/fonts \ --bind-try /usr/share/fonts /usr/local/share/fonts \
--hostname Amber-CE-Bookworm \ --hostname Amber-CE-Bookworm \
--unshare-uts \ --unshare-uts \
--dev-bind /etc/resolv.conf /etc/resolv.conf \ --dev-bind-try /etc/resolv.conf /etc/resolv.conf \
--cap-add CAP_SYS_ADMIN \ --cap-add CAP_SYS_ADMIN \
--dev-bind /home /home \ --dev-bind-try /home /home \
bash -c "${container_command}" bash -c "${container_command}"

16
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 PATH /flamescion-container-tools/bin-override:$PATH \
--setenv IS_ACE_ENV "1" \ --setenv IS_ACE_ENV "1" \
--dev-bind $chrootEnvPath/ / \ --dev-bind $chrootEnvPath/ / \
--dev-bind /media /media \ --dev-bind-try /media /media \
--dev-bind /tmp /tmp \ --dev-bind-try /tmp /tmp \
--dev /dev \ --dev /dev \
--dev-bind /dev/dri /dev/dri \ --dev-bind-try /dev/dri /dev/dri \
--proc /proc \ --proc /proc \
--dev-bind /sys /sys \ --dev-bind /sys /sys \
--dev-bind /run /run \ --dev-bind /run /run \
--dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \ --dev-bind-try /run/user/$uid/pulse /run/user/$uid/pulse \
--dev-bind / /host \ --dev-bind / /host \
--ro-bind /usr/share/themes /usr/local/share/themes \ --bind-try /usr/share/themes /usr/local/share/themes \
--ro-bind /usr/share/icons /usr/local/share/icons \ --bind-try /usr/share/icons /usr/local/share/icons \
--ro-bind /usr/share/fonts /usr/local/share/fonts \ --bind-try /usr/share/fonts /usr/local/share/fonts \
--hostname Amber-CE-Bookworm \ --hostname Amber-CE-Bookworm \
--unshare-uts \ --unshare-uts \
--dev-bind /etc/resolv.conf /etc/resolv.conf \ --dev-bind-try /etc/resolv.conf /etc/resolv.conf \
--cap-add CAP_SYS_ADMIN \ --cap-add CAP_SYS_ADMIN \
--dev-bind /home /home \ --dev-bind-try /home /home \
bash -c "${container_command}" bash -c "${container_command}"