Skip to content

init: Install asahi drivers automatically #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 16, 2024
Merged

init: Install asahi drivers automatically #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cfbd3c
init: Install asahi drivers automatically
TingPing Jul 16, 2024
608825b
init: Remove unused code
TingPing Jul 16, 2024
3b0154b
init: Only run as root
TingPing Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 40 additions & 22 deletions scripts/container-only/.wkdev-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,21 @@ process_command_line_arguments() {
try_copy_hosts_file() {

echo ""
echo "[1/12] Copying /etc/hosts file from host to container..."
echo "[1/13] Copying /etc/hosts file from host to container..."
cp /host/etc/hosts /etc/hosts || _abort_ "Cannot copy /etc/hosts file from host to container"
}

try_update_apt_cache() {

echo ""

echo "[2/12] Updating APT repositories..."
if is_first_time_run; then
update_packages || _abort_ "Cannot update APT repositories"
else
# Do not _abort_ unless this is the first time the container is entered. apt-get may fail if there is no internet connectivity on the host, but we still want to enter.
update_packages || _log_ "Cannot update APT repositories (continuing)"
echo "[2/13] Updating APT repositories..."
if [[ "$(uname -r)" =~ asahi ]]; then
echo "Adding ubuntu-asahi PPA..."
add_ppa 'ubuntu-asahi/ubuntu-asahi' 'asahi' '39CC27E17A201624'
fi

update_packages || _abort_ "Cannot update APT repositories"
}

try_install_shell_package() {
Expand All @@ -68,22 +68,34 @@ try_install_shell_package() {

container_shell_package=$(basename "${container_shell}")
if is_package_installed "${container_shell_package}"; then
echo "[3/12] No need to install user shell package '${container_shell_package}' - it's already present."
echo "[3/13] No need to install user shell package '${container_shell_package}' - it's already present."
else
echo "[3/12] Installing user shell package '${container_shell_package}'..."
echo "[3/13] Installing user shell package '${container_shell_package}'..."
ensure_package_installed "${container_shell_package}"
fi
}

try_install_optional_drivers() {

echo ""

if [[ "$(uname -r)" =~ asahi ]]; then
echo "[4/13] Installing Asahi drivers..."
upgrade_packages 'libegl-mesa0'
else
echo "[4/13] Skipping optional drivers, not needed."
fi
}

try_install_additional_packages() {

echo ""
if [ -z "${additional_packages}" ]; then
echo "[4/12] No need to install additional packages - none necessary."
echo "[5/13] No need to install additional packages - none necessary."
return 0
fi

echo "[4/12] Installing additional packages '${additional_packages}', if necessary..."
echo "[5/13] Installing additional packages '${additional_packages}', if necessary..."
for package in ${additional_packages}; do
if is_package_installed "${package}"; then
echo " Skipping '${package}' - it's already present."
Expand All @@ -99,10 +111,10 @@ try_switch_shell_for_user() {
echo ""

if ! grep "${container_user_name}" /etc/passwd | grep --quiet "${container_shell}"; then
echo "[5/12] Switch shell to '${container_shell}' for container user '${container_user_name}'..."
echo "[6/13] Switch shell to '${container_shell}' for container user '${container_user_name}'..."
usermod --shell "${container_shell}" "${container_user_name}" || _abort_ "Cannot switch shell: executing 'usermod' failed"
else
echo "[5/12] No need to switch shell to '${container_shell}' - it's already the default for user '${container_user_name}'."
echo "[6/13] No need to switch shell to '${container_shell}' - it's already the default for user '${container_user_name}'."
fi
}

Expand All @@ -111,7 +123,7 @@ try_setup_setgid_subuid_files() {
echo ""

if ! grep --quiet "${container_user_name}" /etc/subuid; then
echo "[6/12] Setup /etc/sub{gid|uid} files for user '${container_user_name}'..."
echo "[7/13] Setup /etc/sub{gid|uid} files for user '${container_user_name}'..."
echo ""

# FIXME: This assumes the host UID/GID subordinate range is 100000-200000. We should rather
Expand All @@ -123,7 +135,7 @@ try_setup_setgid_subuid_files() {
# be able to figure out exactly this 'free' subordinate-range. Needs some testing.
usermod --add-subuids 50000-99999 --add-subgids 50000-99999 "${container_user_name}" || _abort_ "Cannot add user '${container_user_name}' to /etc/subgid or /etc/subuid file: executing usermod failed"
else
echo "[6/12] No need to setup /etc/sub{gid|uid} -- UID/GID mapping for container user '${container_user_name}' already present."
echo "[7/13] No need to setup /etc/sub{gid|uid} -- UID/GID mapping for container user '${container_user_name}' already present."
fi

echo " -> /etc/subgid contents: $(cat /etc/subgid)"
Expand All @@ -134,7 +146,7 @@ try_setup_journal_dev_log() {

echo ""

echo "[7/12] Set /dev/log symbolic link to /run/systemd/journal/dev-log ..."
echo "[8/13] Set /dev/log symbolic link to /run/systemd/journal/dev-log ..."
sudo ln -sf /run/systemd/journal/dev-log /dev/log
}

Expand All @@ -144,7 +156,7 @@ try_setup_sudoers_file() {

local sudoers_directory="/etc/sudoers.d"
local sudoers_file="${sudoers_directory}/sudoers"
echo "[8/12] Setup sudoers file '${sudoers_file}' for user '${container_user_name}', if necessary..."
echo "[9/13] Setup sudoers file '${sudoers_file}' for user '${container_user_name}', if necessary..."

mkdir --parents "${sudoers_directory}" &>/dev/null
chmod 750 "${sudoers_directory}"
Expand All @@ -168,7 +180,7 @@ try_setup_run_user_directory() {

local container_user_id=$(id --user --real "${container_user_name}")
local current_run_user_directory="/run/user/${container_user_id}"
echo "[9/12] Initialize systemd-style /run/user/ user session directory '${current_run_user_directory}', if necessary..."
echo "[10/13] Initialize systemd-style /run/user/ user session directory '${current_run_user_directory}', if necessary..."

mkdir --parents "${current_run_user_directory}" &>/dev/null
chmod 700 "${current_run_user_directory}"
Expand All @@ -179,7 +191,7 @@ try_setup_dockerenv_file() {

echo ""

echo "[10/12] Create /.dockerenv file to make 'bwrap' detection work in legacy Epiphany/cog versions..."
echo "[11/13] Create /.dockerenv file to make 'bwrap' detection work in legacy Epiphany/cog versions..."
sudo touch /.dockerenv
}

Expand All @@ -188,7 +200,7 @@ try_setup_permissions_jhbuild_directory() {
echo ""

local jhbuild_directory="/jhbuild"
echo "[11/12] Setup jhbuild '${jhbuild_directory}' directory permissions..."
echo "[12/13] Setup jhbuild '${jhbuild_directory}' directory permissions..."

chown --recursive "${container_user_name}:${container_group_name}" "${jhbuild_directory}" &>/dev/null

Expand All @@ -201,10 +213,10 @@ try_firstrun_script() {
user_home=$(getent passwd "${container_user_name}" | cut -d: -f6)

if [ -x "${user_home}/.wkdev-firstrun" ]; then
echo "[12/12] Executing ${user_home}/.wkdev-firstrun"
echo "[13/13] Executing ${user_home}/.wkdev-firstrun"
su "${container_user_name}" --group="${container_group_name}" --command="${user_home}/.wkdev-firstrun"
else
echo "[12/12] Skipping ${user_home}/.wkdev-firstrun script, no executable found."
echo "[13/13] Skipping ${user_home}/.wkdev-firstrun script, no executable found."
fi
}

Expand All @@ -218,6 +230,11 @@ sleep_forever() {
# Main functionality
run() {

if [ "$EUID" -ne 0 ]; then
echo "This script should only be ran as root."
exit 1
fi

process_command_line_arguments "${@}"

if [ -f "$(get_init_done_file)" ]; then
Expand All @@ -233,6 +250,7 @@ run() {
try_copy_hosts_file
try_update_apt_cache
try_install_shell_package
try_install_optional_drivers
try_install_additional_packages
try_switch_shell_for_user
try_setup_setgid_subuid_files
Expand Down
24 changes: 24 additions & 0 deletions utilities/debian-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,23 @@ verify_executables_exist apt-get dpkg-query

update_packages() { apt-get update; }

add_ppa() {

local ppa_repo="${1}" # e.g. project/name
local name="${2}"
local signing_key="${3}"
local keyring="/etc/apt/keyrings/${name}.gpg"

mkdir "${HOME}/.gnupg"
dirmngr --daemon
gpg --no-default-keyring --keyring="/etc/apt/keyrings/${name}.gpg" --keyserver=keyserver.ubuntu.com --recv-keys "${signing_key}" || _abort_ "Failed to import key for ${ppa_repo}"
dirmngr --shutdown
rm -r "${HOME}/.gnupg"

echo "deb [signed-by=${keyring}] http://ppa.launchpad.net/${ppa_repo}/ubuntu noble main
deb-src [signed-by=${keyring}] http://ppa.launchpad.net/${ppa_repo}/ubuntu noble main" > "/etc/apt/sources.list.d/${name}.list"
}

is_package_installed() {

local package="${1}"
Expand All @@ -19,3 +36,10 @@ ensure_package_installed() {
is_package_installed "${package}" && return 0
apt-get --assume-yes install "${package}" || _abort_ "Cannot install package '${package}': executing 'apt-get install' failed"
}

upgrade_packages() {

local packages="${@}"

apt-get upgrade -y "${packages}" || _abort_ "Cannot upgrade packages '${packages}': executing 'apt-get upgrade' failed"
}