mirror of
https://gitee.com/amber-ce/amber-ce-bookworm.git
synced 2025-07-27 07:52:24 +08:00
* fix：时区出错
This commit is contained in:
parent
a2c95f2518
commit
0549dc74c3
src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files
@ -37,16 +37,15 @@ bwrap --dev-bind $chrootEnvPath/ / \
|
|||||||
--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" \
|
--setenv IS_ACE_ENV "1" \
|
||||||
--dev-bind $chrootEnvPath/ / \
|
|
||||||
--dev-bind-try /media /media \
|
--dev-bind-try /media /media \
|
||||||
--dev-bind-try /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 \
|
||||||
|
--dev-bind / /host \
|
||||||
--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 \
|
|
||||||
--bind-try /usr/share/themes /usr/local/share/themes \
|
--bind-try /usr/share/themes /usr/local/share/themes \
|
||||||
--bind-try /usr/share/icons /usr/local/share/icons \
|
--bind-try /usr/share/icons /usr/local/share/icons \
|
||||||
--bind-try /usr/share/fonts /usr/local/share/fonts \
|
--bind-try /usr/share/fonts /usr/local/share/fonts \
|
||||||
@ -58,9 +57,7 @@ bwrap --dev-bind $chrootEnvPath/ / \
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
# Move the package init work to build stage
|
|
||||||
#bookworm-run apt update
|
|
||||||
#bookworm-run apt install apt-utils bc curl dialog diffutils findutils gnupg2 less libnss-myhostname libvte-2.9*-common libvte-common lsof ncurses-base passwd pinentry-curses procps sudo time util-linux wget libegl1-mesa libgl1-mesa-glx libvulkan1 mesa-vulkan-drivers locales libglib2.0-bin -y
|
|
||||||
echo "Update the flamescion container tools"
|
echo "Update the flamescion container tools"
|
||||||
cp -r `dirname $chrootEnvPath`/flamescion-container-tools/ $chrootEnvPath
|
cp -r `dirname $chrootEnvPath`/flamescion-container-tools/ $chrootEnvPath
|
||||||
|
|
||||||
@ -73,252 +70,13 @@ container_user_name="${non_root_user}"
|
|||||||
container_user_uid="$(sudo -u $non_root_user id -ru)"
|
container_user_uid="$(sudo -u $non_root_user id -ru)"
|
||||||
|
|
||||||
|
|
||||||
cat << EOFFFFFF > $chrootEnvPath/init.sh
|
|
||||||
#!/bin/bash
|
|
||||||
printf "bookworm-cm: Setting up sudo...\n"
|
|
||||||
mkdir -p /etc/sudoers.d
|
|
||||||
# Do not check fqdn when doing sudo, it will not work anyways
|
|
||||||
if ! grep -q 'Defaults !fqdn' /etc/sudoers.d/sudoers; then
|
|
||||||
printf "Defaults !fqdn\n" >> /etc/sudoers.d/sudoers
|
|
||||||
fi
|
|
||||||
# Ensure passwordless sudo is set up for user
|
|
||||||
if ! grep -q "\"${container_user_name}\" ALL = (root) NOPASSWD:ALL" /etc/sudoers.d/sudoers; then
|
|
||||||
printf "\"%s\" ALL = (root) NOPASSWD:ALL\n" "${container_user_name}" >> /etc/sudoers.d/sudoers
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
printf "bookworm-cm: Setting up groups...\n"
|
|
||||||
# If not existing, ensure we have a group for our user.
|
|
||||||
if ! grep -q "^${container_user_name}:" /etc/group; then
|
|
||||||
if ! groupadd --force --gid "${container_user_gid}" "${container_user_name}"; then
|
|
||||||
# It may occur that we have users with unsupported user name (eg. on LDAP or AD)
|
|
||||||
# So let's try and force the group creation this way.
|
|
||||||
printf "%s:x:%s:" "${container_user_name}" "${container_user_gid}" >> /etc/group
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
printf "bookworm-cm: Setting up users...\n"
|
|
||||||
|
|
||||||
# Setup kerberos integration with the host
|
|
||||||
if [ -d "/run/host/var/kerberos" ] &&
|
|
||||||
[ -d "/etc/krb5.conf.d" ] &&
|
|
||||||
[ ! -e "/etc/krb5.conf.d/kcm_default_ccache" ]; then
|
|
||||||
|
|
||||||
cat << EOF > "/etc/krb5.conf.d/kcm_default_ccache"
|
|
||||||
# # To disable the KCM credential cache, comment out the following lines.
|
|
||||||
[libdefaults]
|
|
||||||
default_ccache_name = KCM:
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If we have sudo/wheel groups, let's add the user to them.
|
|
||||||
additional_groups=""
|
|
||||||
if grep -q "^sudo" /etc/group; then
|
|
||||||
additional_groups="sudo"
|
|
||||||
elif grep -q "^wheel" /etc/group; then
|
|
||||||
additional_groups="wheel"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Let's add our user to the container. if the user already exists, enforce properties.
|
|
||||||
#
|
|
||||||
# In case of AD or LDAP usernames, it is possible we will have a backslach in the name.
|
|
||||||
# In that case grep would fail, so we replace the backslash with a point to make the regex work.
|
|
||||||
# shellcheck disable=SC1003
|
|
||||||
if ! grep -q "^$(printf '%s' "${container_user_name}" | tr '\\' '.'):" /etc/passwd &&
|
|
||||||
! grep -q "^.*:.*:${container_user_uid}:" /etc/passwd; then
|
|
||||||
if ! useradd \
|
|
||||||
--home-dir "${container_user_home}" \
|
|
||||||
--no-create-home \
|
|
||||||
--groups "${additional_groups}" \
|
|
||||||
--shell "${SHELL:-"/bin/bash"}" \
|
|
||||||
--uid "${container_user_uid}" \
|
|
||||||
--gid "${container_user_gid}" \
|
|
||||||
"${container_user_name}"; then
|
|
||||||
|
|
||||||
printf "Warning: there was a problem setting up the user\n"
|
|
||||||
printf "Warning: trying manual addition\n"
|
|
||||||
printf "%s:x:%s:%s:%s:%s:%s" \
|
|
||||||
"${container_user_name}" "${container_user_uid}" \
|
|
||||||
"${container_user_gid}" "${container_user_name}" \
|
|
||||||
"${container_user_home}" "${SHELL:-"/bin/bash"}" >> /etc/passwd
|
|
||||||
printf "%s::1::::::" "${container_user_name}" >> /etc/shadow
|
|
||||||
fi
|
|
||||||
# Ensure we're not using the specified SHELL. Run it only once, so that future
|
|
||||||
# user's preferences are not overwritten at each start.
|
|
||||||
elif [ ! -e /etc/passwd.done ]; then
|
|
||||||
# This situation is presented when podman or docker already creates the user
|
|
||||||
# for us inside container. We should modify the user's prepopulated shadowfile
|
|
||||||
# entry though as per user's active preferences.
|
|
||||||
|
|
||||||
# If the user was there with a different username, get that username so
|
|
||||||
# we can modify it
|
|
||||||
if ! grep -q "^$(printf '%s' "${container_user_name}" | tr '\\' '.'):" /etc/passwd; then
|
|
||||||
user_to_modify=$(getent passwd "${container_user_uid}" | cut -d: -f1)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! usermod \
|
|
||||||
--home "${container_user_home}" \
|
|
||||||
--shell "${SHELL:-"/bin/bash"}" \
|
|
||||||
--groups "${additional_groups}" \
|
|
||||||
--uid "${container_user_uid}" \
|
|
||||||
--gid "${container_user_gid}" \
|
|
||||||
--login "${container_user_name}" \
|
|
||||||
"${user_to_modify:-"${container_user_name}"}"; then
|
|
||||||
|
|
||||||
printf "Warning: there was a problem setting up the user\n"
|
|
||||||
fi
|
|
||||||
touch /etc/passwd.done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# We generate a random password to initialize the entry for the user and root.
|
|
||||||
temporary_password="$(cat /proc/sys/kernel/random/uuid)"
|
|
||||||
printf "%s\n%s\n" "${temporary_password}" "${temporary_password}" | passwd root
|
|
||||||
printf "%s:%s" "${container_user_name}" "${temporary_password}" | chpasswd -e
|
|
||||||
# Delete password for root and user
|
|
||||||
printf "%s:" "root" | chpasswd -e
|
|
||||||
printf "%s:" "${container_user_name}" | chpasswd -e
|
|
||||||
|
|
||||||
mkdir -p /usr/share/fonts
|
|
||||||
mkdir -p /usr/share/icons
|
|
||||||
mkdir -p /usr/share/themes
|
|
||||||
|
|
||||||
## init host-spawn
|
|
||||||
unlink /flamescion-container-tools/bin-override/host-spawn
|
|
||||||
ln -sfv /flamescion-container-tools/bin-override/host-spawn-$(uname -m) /flamescion-container-tools/bin-override/host-spawn
|
|
||||||
|
|
||||||
## install host-integration
|
|
||||||
|
|
||||||
apt install --reinstall /flamescion-container-tools/ace-host-integration.deb
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Do NVIDIA Integration
|
|
||||||
|
|
||||||
echo "ACE: NVIDIA Integration"
|
|
||||||
|
|
||||||
ensureTargetDir() {
|
|
||||||
targetFile=$1
|
|
||||||
t=$(dirname "$targetFile")
|
|
||||||
mkdir -p "$t"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
lib32_dir="/usr/lib/"
|
|
||||||
lib64_dir="/usr/lib/"
|
|
||||||
if [ -e "/usr/lib/x86_64-linux-gnu" ]; then
|
|
||||||
lib64_dir="/usr/lib/x86_64-linux-gnu/"
|
|
||||||
elif [ -e "/usr/lib64" ]; then
|
|
||||||
lib64_dir="/usr/lib64/"
|
|
||||||
fi
|
|
||||||
if [ -e "/usr/lib/i386-linux-gnu" ]; then
|
|
||||||
lib32_dir="/usr/lib/i386-linux-gnu/"
|
|
||||||
elif [ -e "/usr/lib32" ]; then
|
|
||||||
lib32_dir="/usr/lib32/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# First we find all non-lib files we need, this includes
|
|
||||||
# - binaries
|
|
||||||
# - confs
|
|
||||||
# - egl files
|
|
||||||
# - icd files
|
|
||||||
# Excluding here the libs, we will threat them later specifically
|
|
||||||
NVIDIA_FILES="$(find /host/etc/ /host/usr/ \
|
|
||||||
-path "/host/usr/lib/i386-linux-gnu/*" -prune -o \
|
|
||||||
-path "/host/usr/lib/x86_64-linux-gnu/*" -prune -o \
|
|
||||||
-path "/host/usr/lib32/*" -prune -o \
|
|
||||||
-path "/host/usr/lib64/*" -prune -o \
|
|
||||||
-iname "*nvidia*" -not -type d -print 2> /dev/null || :)"
|
|
||||||
for nvidia_file in ${NVIDIA_FILES}; do
|
|
||||||
dest_file="$(printf "%s" "${nvidia_file}" | sed 's|/host||g')"
|
|
||||||
ensureTargetDir ${dest_file}
|
|
||||||
cp -r "${nvidia_file}" "${dest_file}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Then we find all directories with nvidia in the name and just mount them
|
|
||||||
NVIDIA_DIRS="$(find /host/etc /host/usr -iname "*nvidia*" -type d 2> /dev/null || :)"
|
|
||||||
for nvidia_dir in ${NVIDIA_DIRS}; do
|
|
||||||
# /usr/lib64 is common in Arch or RPM based distros, while /usr/lib/x86_64-linux-gnu is
|
|
||||||
# common on Debian derivatives, so we need to adapt between the two nomenclatures.
|
|
||||||
if printf "%s" "${nvidia_dir}" | grep -Eq "lib32|lib64|x86_64-linux-gnu|i386-linux-gnu"; then
|
|
||||||
|
|
||||||
# Remove origin so we plug our own
|
|
||||||
dest_dir="$(printf "%s" "${nvidia_dir}" |
|
|
||||||
sed "s|/host/usr/lib/x86_64-linux-gnu/|${lib64_dir}|g" |
|
|
||||||
sed "s|/host/usr/lib/i386-linux-gnu/|${lib32_dir}|g" |
|
|
||||||
sed "s|/host/usr/lib64/|${lib64_dir}|g" |
|
|
||||||
sed "s|/host/usr/lib32/|${lib32_dir}|g")"
|
|
||||||
else
|
|
||||||
dest_dir="$(printf "%s" "${nvidia_dir}" | sed 's|/host||g')"
|
|
||||||
fi
|
|
||||||
ensureTargetDir ${dest_file}
|
|
||||||
cp -r "${nvidia_dir}" "${dest_file}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Then we find all the ".so" libraries, there are searched separately
|
|
||||||
# because we need to extract the relative path to mount them in the
|
|
||||||
# correct path based on the guest's setup
|
|
||||||
#
|
|
||||||
# /usr/lib64 is common in Arch or RPM based distros, while /usr/lib/x86_64-linux-gnu is
|
|
||||||
# common on Debian derivatives, so we need to adapt between the two nomenclatures.
|
|
||||||
NVIDIA_LIBS="$(find \
|
|
||||||
/host/usr/lib/i386-linux-gnu/ \
|
|
||||||
/host/usr/lib/x86_64-linux-gnu/ \
|
|
||||||
/host/usr/lib32/ \
|
|
||||||
/host/usr/lib64/ \
|
|
||||||
-iname "*nvidia*.so*" \
|
|
||||||
-o -iname "libcuda*.so*" \
|
|
||||||
-o -iname "libnvcuvid*.so*" \
|
|
||||||
-o -iname "libnvoptix*.so*" 2> /dev/null || :)"
|
|
||||||
for nvidia_lib in ${NVIDIA_LIBS}; do
|
|
||||||
dest_file="$(printf "%s" "${nvidia_lib}" |
|
|
||||||
sed "s|/host/usr/lib/x86_64-linux-gnu/|${lib64_dir}|g" |
|
|
||||||
sed "s|/host/usr/lib/i386-linux-gnu/|${lib32_dir}|g" |
|
|
||||||
sed "s|/host/usr/lib64/|${lib64_dir}|g" |
|
|
||||||
sed "s|/host/usr/lib32/|${lib32_dir}|g")"
|
|
||||||
|
|
||||||
# If file exists, just continue
|
|
||||||
# this may happen for directories like /usr/lib/nvidia/xorg/foo.so
|
|
||||||
# where the directory is already bind mounted (ro) and we don't need
|
|
||||||
# to mount further files in it.
|
|
||||||
if [ -e "${dest_file}" ]; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
type="file"
|
|
||||||
if [ -L "${nvidia_lib}" ]; then
|
|
||||||
type="link"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${type}" = "link" ]; then
|
|
||||||
mkdir -p "$(dirname "${dest_file}")"
|
|
||||||
cp -d "${nvidia_lib}" "${dest_file}"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
ensureTargetDir ${dest_file}
|
|
||||||
cp -r "${nvidia_lib}" "${dest_file}"
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
# Refresh ldconfig cache, also detect if there are empty files remaining
|
|
||||||
# and clean them.
|
|
||||||
# This could happen when upgrading drivers and changing versions.
|
|
||||||
empty_libs="$(ldconfig 2>&1 | grep -Eo "File.*is empty" | cut -d' ' -f2)"
|
|
||||||
if [ -n "${empty_libs}" ]; then
|
|
||||||
# shellcheck disable=SC2086
|
|
||||||
find ${empty_libs} -delete 2> /dev/null || :
|
|
||||||
find /usr/ /etc/ -empty -iname "*nvidia*" -delete 2> /dev/null || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
EOFFFFFF
|
|
||||||
|
|
||||||
#####init
|
#####init
|
||||||
|
|
||||||
chmod +x $chrootEnvPath/init.sh
|
|
||||||
bookworm-run bash /init.sh
|
|
||||||
bookworm-run rm /init.sh
|
|
||||||
bookworm-run cp /host/etc/locale.gen /etc/locale.gen && locale-gen
|
|
||||||
|
|
||||||
|
bookworm-run bash /flamescion-container-tools/container-init/init.sh
|
||||||
|
bookworm-run cp /host/etc/locale.gen /etc/locale.gen && locale-gen
|
||||||
bookworm-run touch /finish.flag
|
bookworm-run touch /finish.flag
|
||||||
bookworm-run apt clean
|
bookworm-run apt clean
|
||||||
bookworm-run chown -R $(who | awk '{print $1}' | head -n 1) /usr/lib/locale/
|
bookworm-run chown -R $(who | awk '{print $1}' | head -n 1) /usr/lib/locale/
|
||||||
|
|||||||
@ -114,12 +114,17 @@ BIND_DIRS=(
|
|||||||
"--ro-bind-try /usr/share/themes /usr/local/share/themes"
|
"--ro-bind-try /usr/share/themes /usr/local/share/themes"
|
||||||
"--ro-bind-try /usr/share/icons /usr/local/share/icons"
|
"--ro-bind-try /usr/share/icons /usr/local/share/icons"
|
||||||
"--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
|
"--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
|
||||||
|
"--ro-bind-try $(realpath /etc/localtime) /etc/localtime"
|
||||||
|
"--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
|
||||||
|
"--dev-bind-try /home /home"
|
||||||
|
|
||||||
|
)
|
||||||
|
EXTRA_ARGS=(
|
||||||
"--hostname Amber-CE-Bookworm"
|
"--hostname Amber-CE-Bookworm"
|
||||||
"--unshare-uts"
|
"--unshare-uts"
|
||||||
"--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
|
|
||||||
"--cap-add CAP_SYS_ADMIN"
|
"--cap-add CAP_SYS_ADMIN"
|
||||||
"--dev-bind-try /home /home"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
EXTRA_SCRIPTS=(
|
EXTRA_SCRIPTS=(
|
||||||
cursor_theme_dir_integration
|
cursor_theme_dir_integration
|
||||||
)
|
)
|
||||||
@ -134,6 +139,10 @@ for var in "${BIND_DIRS[@]}"; do
|
|||||||
add_command "$var"
|
add_command "$var"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
for var in "${EXTRA_ARGS[@]}"; do
|
||||||
|
add_command "$var"
|
||||||
|
done
|
||||||
|
|
||||||
for var in "${EXTRA_SCRIPTS[@]}"; do
|
for var in "${EXTRA_SCRIPTS[@]}"; do
|
||||||
$var
|
$var
|
||||||
done
|
done
|
||||||
|
|||||||
245
src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh
Executable file
245
src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh
Executable file
@ -0,0 +1,245 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
if [ "$IS_ACE_ENV" != "1" ];then
|
||||||
|
echo "ONLY RUN ME IN ACE"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
printf "ACE: Setting up sudo...\n"
|
||||||
|
mkdir -p /etc/sudoers.d
|
||||||
|
# Do not check fqdn when doing sudo, it will not work anyways
|
||||||
|
if ! grep -q 'Defaults !fqdn' /etc/sudoers.d/sudoers; then
|
||||||
|
printf "Defaults !fqdn\n" >> /etc/sudoers.d/sudoers
|
||||||
|
fi
|
||||||
|
# Ensure passwordless sudo is set up for user
|
||||||
|
if ! grep -q "\"${container_user_name}\" ALL = (root) NOPASSWD:ALL" /etc/sudoers.d/sudoers; then
|
||||||
|
printf "\"%s\" ALL = (root) NOPASSWD:ALL\n" "${container_user_name}" >> /etc/sudoers.d/sudoers
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
printf "ACE: Setting up groups...\n"
|
||||||
|
# If not existing, ensure we have a group for our user.
|
||||||
|
if ! grep -q "^${container_user_name}:" /etc/group; then
|
||||||
|
if ! groupadd --force --gid "${container_user_gid}" "${container_user_name}"; then
|
||||||
|
# It may occur that we have users with unsupported user name (eg. on LDAP or AD)
|
||||||
|
# So let's try and force the group creation this way.
|
||||||
|
printf "%s:x:%s:" "${container_user_name}" "${container_user_gid}" >> /etc/group
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf "ACE: Setting up users...\n"
|
||||||
|
|
||||||
|
# Setup kerberos integration with the host
|
||||||
|
if [ -d "/run/host/var/kerberos" ] &&
|
||||||
|
[ -d "/etc/krb5.conf.d" ] &&
|
||||||
|
[ ! -e "/etc/krb5.conf.d/kcm_default_ccache" ]; then
|
||||||
|
|
||||||
|
cat << EOF > "/etc/krb5.conf.d/kcm_default_ccache"
|
||||||
|
# # To disable the KCM credential cache, comment out the following lines.
|
||||||
|
[libdefaults]
|
||||||
|
default_ccache_name = KCM:
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If we have sudo/wheel groups, let's add the user to them.
|
||||||
|
additional_groups=""
|
||||||
|
if grep -q "^sudo" /etc/group; then
|
||||||
|
additional_groups="sudo"
|
||||||
|
elif grep -q "^wheel" /etc/group; then
|
||||||
|
additional_groups="wheel"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Let's add our user to the container. if the user already exists, enforce properties.
|
||||||
|
#
|
||||||
|
# In case of AD or LDAP usernames, it is possible we will have a backslach in the name.
|
||||||
|
# In that case grep would fail, so we replace the backslash with a point to make the regex work.
|
||||||
|
# shellcheck disable=SC1003
|
||||||
|
if ! grep -q "^$(printf '%s' "${container_user_name}" | tr '\\' '.'):" /etc/passwd &&
|
||||||
|
! grep -q "^.*:.*:${container_user_uid}:" /etc/passwd; then
|
||||||
|
if ! useradd \
|
||||||
|
--home-dir "${container_user_home}" \
|
||||||
|
--no-create-home \
|
||||||
|
--groups "${additional_groups}" \
|
||||||
|
--shell "${SHELL:-"/bin/bash"}" \
|
||||||
|
--uid "${container_user_uid}" \
|
||||||
|
--gid "${container_user_gid}" \
|
||||||
|
"${container_user_name}"; then
|
||||||
|
|
||||||
|
printf "Warning: there was a problem setting up the user\n"
|
||||||
|
printf "Warning: trying manual addition\n"
|
||||||
|
printf "%s:x:%s:%s:%s:%s:%s" \
|
||||||
|
"${container_user_name}" "${container_user_uid}" \
|
||||||
|
"${container_user_gid}" "${container_user_name}" \
|
||||||
|
"${container_user_home}" "${SHELL:-"/bin/bash"}" >> /etc/passwd
|
||||||
|
printf "%s::1::::::" "${container_user_name}" >> /etc/shadow
|
||||||
|
fi
|
||||||
|
# Ensure we're not using the specified SHELL. Run it only once, so that future
|
||||||
|
# user's preferences are not overwritten at each start.
|
||||||
|
elif [ ! -e /etc/passwd.done ]; then
|
||||||
|
# This situation is presented when podman or docker already creates the user
|
||||||
|
# for us inside container. We should modify the user's prepopulated shadowfile
|
||||||
|
# entry though as per user's active preferences.
|
||||||
|
|
||||||
|
# If the user was there with a different username, get that username so
|
||||||
|
# we can modify it
|
||||||
|
if ! grep -q "^$(printf '%s' "${container_user_name}" | tr '\\' '.'):" /etc/passwd; then
|
||||||
|
user_to_modify=$(getent passwd "${container_user_uid}" | cut -d: -f1)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! usermod \
|
||||||
|
--home "${container_user_home}" \
|
||||||
|
--shell "${SHELL:-"/bin/bash"}" \
|
||||||
|
--groups "${additional_groups}" \
|
||||||
|
--uid "${container_user_uid}" \
|
||||||
|
--gid "${container_user_gid}" \
|
||||||
|
--login "${container_user_name}" \
|
||||||
|
"${user_to_modify:-"${container_user_name}"}"; then
|
||||||
|
|
||||||
|
printf "Warning: there was a problem setting up the user\n"
|
||||||
|
fi
|
||||||
|
touch /etc/passwd.done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# We generate a random password to initialize the entry for the user and root.
|
||||||
|
temporary_password="$(cat /proc/sys/kernel/random/uuid)"
|
||||||
|
printf "%s\n%s\n" "${temporary_password}" "${temporary_password}" | passwd root
|
||||||
|
printf "%s:%s" "${container_user_name}" "${temporary_password}" | chpasswd -e
|
||||||
|
# Delete password for root and user
|
||||||
|
printf "%s:" "root" | chpasswd -e
|
||||||
|
printf "%s:" "${container_user_name}" | chpasswd -e
|
||||||
|
|
||||||
|
mkdir -p /usr/share/fonts
|
||||||
|
mkdir -p /usr/share/icons
|
||||||
|
mkdir -p /usr/share/themes
|
||||||
|
|
||||||
|
## init host-spawn
|
||||||
|
unlink /flamescion-container-tools/bin-override/host-spawn
|
||||||
|
ln -sfv /flamescion-container-tools/bin-override/host-spawn-$(uname -m) /flamescion-container-tools/bin-override/host-spawn
|
||||||
|
|
||||||
|
## install host-integration
|
||||||
|
|
||||||
|
apt install --reinstall /flamescion-container-tools/ace-host-integration.deb
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Do NVIDIA Integration
|
||||||
|
|
||||||
|
echo "ACE: NVIDIA Integration"
|
||||||
|
|
||||||
|
ensureTargetDir() {
|
||||||
|
targetFile=$1
|
||||||
|
t=$(dirname "$targetFile")
|
||||||
|
mkdir -p "$t"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
lib32_dir="/usr/lib/"
|
||||||
|
lib64_dir="/usr/lib/"
|
||||||
|
if [ -e "/usr/lib/x86_64-linux-gnu" ]; then
|
||||||
|
lib64_dir="/usr/lib/x86_64-linux-gnu/"
|
||||||
|
elif [ -e "/usr/lib64" ]; then
|
||||||
|
lib64_dir="/usr/lib64/"
|
||||||
|
fi
|
||||||
|
if [ -e "/usr/lib/i386-linux-gnu" ]; then
|
||||||
|
lib32_dir="/usr/lib/i386-linux-gnu/"
|
||||||
|
elif [ -e "/usr/lib32" ]; then
|
||||||
|
lib32_dir="/usr/lib32/"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# First we find all non-lib files we need, this includes
|
||||||
|
# - binaries
|
||||||
|
# - confs
|
||||||
|
# - egl files
|
||||||
|
# - icd files
|
||||||
|
# Excluding here the libs, we will threat them later specifically
|
||||||
|
NVIDIA_FILES="$(find /host/etc/ /host/usr/ \
|
||||||
|
-path "/host/usr/lib/i386-linux-gnu/*" -prune -o \
|
||||||
|
-path "/host/usr/lib/x86_64-linux-gnu/*" -prune -o \
|
||||||
|
-path "/host/usr/lib32/*" -prune -o \
|
||||||
|
-path "/host/usr/lib64/*" -prune -o \
|
||||||
|
-iname "*nvidia*" -not -type d -print 2> /dev/null || :)"
|
||||||
|
for nvidia_file in ${NVIDIA_FILES}; do
|
||||||
|
dest_file="$(printf "%s" "${nvidia_file}" | sed 's|/host||g')"
|
||||||
|
ensureTargetDir ${dest_file}
|
||||||
|
cp -r "${nvidia_file}" "${dest_file}"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Then we find all directories with nvidia in the name and just mount them
|
||||||
|
NVIDIA_DIRS="$(find /host/etc /host/usr -iname "*nvidia*" -type d 2> /dev/null || :)"
|
||||||
|
for nvidia_dir in ${NVIDIA_DIRS}; do
|
||||||
|
# /usr/lib64 is common in Arch or RPM based distros, while /usr/lib/x86_64-linux-gnu is
|
||||||
|
# common on Debian derivatives, so we need to adapt between the two nomenclatures.
|
||||||
|
if printf "%s" "${nvidia_dir}" | grep -Eq "lib32|lib64|x86_64-linux-gnu|i386-linux-gnu"; then
|
||||||
|
|
||||||
|
# Remove origin so we plug our own
|
||||||
|
dest_dir="$(printf "%s" "${nvidia_dir}" |
|
||||||
|
sed "s|/host/usr/lib/x86_64-linux-gnu/|${lib64_dir}|g" |
|
||||||
|
sed "s|/host/usr/lib/i386-linux-gnu/|${lib32_dir}|g" |
|
||||||
|
sed "s|/host/usr/lib64/|${lib64_dir}|g" |
|
||||||
|
sed "s|/host/usr/lib32/|${lib32_dir}|g")"
|
||||||
|
else
|
||||||
|
dest_dir="$(printf "%s" "${nvidia_dir}" | sed 's|/host||g')"
|
||||||
|
fi
|
||||||
|
ensureTargetDir ${dest_file}
|
||||||
|
cp -r "${nvidia_dir}" "${dest_file}"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Then we find all the ".so" libraries, there are searched separately
|
||||||
|
# because we need to extract the relative path to mount them in the
|
||||||
|
# correct path based on the guest's setup
|
||||||
|
#
|
||||||
|
# /usr/lib64 is common in Arch or RPM based distros, while /usr/lib/x86_64-linux-gnu is
|
||||||
|
# common on Debian derivatives, so we need to adapt between the two nomenclatures.
|
||||||
|
NVIDIA_LIBS="$(find \
|
||||||
|
/host/usr/lib/i386-linux-gnu/ \
|
||||||
|
/host/usr/lib/x86_64-linux-gnu/ \
|
||||||
|
/host/usr/lib32/ \
|
||||||
|
/host/usr/lib64/ \
|
||||||
|
-iname "*nvidia*.so*" \
|
||||||
|
-o -iname "libcuda*.so*" \
|
||||||
|
-o -iname "libnvcuvid*.so*" \
|
||||||
|
-o -iname "libnvoptix*.so*" 2> /dev/null || :)"
|
||||||
|
for nvidia_lib in ${NVIDIA_LIBS}; do
|
||||||
|
dest_file="$(printf "%s" "${nvidia_lib}" |
|
||||||
|
sed "s|/host/usr/lib/x86_64-linux-gnu/|${lib64_dir}|g" |
|
||||||
|
sed "s|/host/usr/lib/i386-linux-gnu/|${lib32_dir}|g" |
|
||||||
|
sed "s|/host/usr/lib64/|${lib64_dir}|g" |
|
||||||
|
sed "s|/host/usr/lib32/|${lib32_dir}|g")"
|
||||||
|
|
||||||
|
# If file exists, just continue
|
||||||
|
# this may happen for directories like /usr/lib/nvidia/xorg/foo.so
|
||||||
|
# where the directory is already bind mounted (ro) and we don't need
|
||||||
|
# to mount further files in it.
|
||||||
|
if [ -e "${dest_file}" ]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
type="file"
|
||||||
|
if [ -L "${nvidia_lib}" ]; then
|
||||||
|
type="link"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${type}" = "link" ]; then
|
||||||
|
mkdir -p "$(dirname "${dest_file}")"
|
||||||
|
cp -d "${nvidia_lib}" "${dest_file}"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
ensureTargetDir ${dest_file}
|
||||||
|
cp -r "${nvidia_lib}" "${dest_file}"
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
# Refresh ldconfig cache, also detect if there are empty files remaining
|
||||||
|
# and clean them.
|
||||||
|
# This could happen when upgrading drivers and changing versions.
|
||||||
|
empty_libs="$(ldconfig 2>&1 | grep -Eo "File.*is empty" | cut -d' ' -f2)"
|
||||||
|
if [ -n "${empty_libs}" ]; then
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
find ${empty_libs} -delete 2> /dev/null || :
|
||||||
|
find /usr/ /etc/ -empty -iname "*nvidia*" -delete 2> /dev/null || :
|
||||||
|
fi
|
||||||
|
echo "ACE: Timezone Integration"
|
||||||
|
rm /etc/localtime
|
||||||
|
cp $(realpath /host/etc/localtime) /etc/localtime
|
||||||
|
chmod 777 /etc/localtime
|
||||||
Loading…
x
Reference in New Issue
Block a user