From 9913e3da4d5dde745a9e2f2ba5f6a483605e76d4 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sat, 14 Oct 2023 21:27:34 -0600 Subject: [PATCH] chore(treewide): Drop askpass, use pkexec This is much nicer as it uses the native polkit interface for password prompts and doesn't require any foolery like setting ksshaskpass/openssh-askpass as the global paramter for sudo askpass --- Containerfile | 3 +-- .../shared/usr/share/ublue-os/firstboot/yafti.yml | 10 +++++----- .../shared/usr/share/ublue-os/just/60-custom.just | 2 +- .../desktop/shared/usr/etc/profile.d/askpass.sh | 11 ----------- .../shared/usr/share/ublue-os/firstboot/yafti.yml | 2 +- 5 files changed, 8 insertions(+), 20 deletions(-) delete mode 100755 system_files/desktop/shared/usr/etc/profile.d/askpass.sh diff --git a/Containerfile b/Containerfile index 51a7896e..35b2310e 100644 --- a/Containerfile +++ b/Containerfile @@ -169,8 +169,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \ gnome-shell-extension-blur-my-shell \ gnome-shell-extension-hanabi \ gnome-shell-extension-gamerzilla \ - rom-properties-gtk3 \ - openssh-askpass && \ + rom-properties-gtk3 && \ rpm-ostree override remove \ gnome-classic-session \ gnome-tour \ diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml index 7962563d..bae27b16 100644 --- a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml +++ b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml @@ -36,7 +36,7 @@ screens: description: A plugin loader for the Steam Deck default: false packages: - - Retrieve Decky: sudo -A just --unstable get-decky + - Retrieve Decky: pkexec just --justfile /usr/share/ublue-os/justfile --unstable get-decky EmuDeck: description: | A utility for installing and configuring emulators on the Steam Deck @@ -53,7 +53,7 @@ screens: NOTE: Press the escape key before boot to show the menu default: true packages: - - Hide GRUB: sudo -A just --unstable hide-grub + - Hide GRUB: pkexec just --justfile /usr/share/ublue-os/justfile --unstable hide-grub Legacy Memory Configuration (Not recommended): description: Disable ZRAM and enable adjustable swap file, defaults to 1GB. default: false @@ -64,7 +64,7 @@ screens: description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible default: false packages: - - Install Nix Package Support: sudo -A just --unstable install-nix + - Install Nix Package Support: pkexec just --justfile /usr/share/ublue-os/justfile --unstable install-nix - Install Fleek (Requires Nix): just --unstable install-fleek Oversteer: description: Application to control supported steering wheels @@ -110,12 +110,12 @@ screens: description: Disable BTRFS support for SD cards for direct compatibility with SD cards formatted on stock SteamOS (Not recommended). default: false packages: - - Switch SteamOS-BTRFS config to EXT4: sudo -A just --unstable switch-to-ext4 + - Switch SteamOS-BTRFS config to EXT4: pkexec just --justfile /usr/share/ublue-os/justfile --unstable switch-to-ext4 Disable DNS-over-TLS: description: Disables secure DNS, for users with problems connecting with DOT enabled. default: false packages: - - Disable DOT: sudo -A just --unstable disable-secure-dns + - Disable DOT: pkexec just --justfile /usr/share/ublue-os/justfile --unstable disable-secure-dns applications: source: yafti.screen.package values: diff --git a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just b/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just index f190db18..aeb4785a 100644 --- a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just +++ b/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just @@ -361,7 +361,7 @@ resize-zram: if grep -q "zram-size" <<< $(cat ${CONFIG}); then sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG} else - sudo -A echo "zram-size=${NEW_SIZE}" >> ${CONFIG} + sudo echo "zram-size=${NEW_SIZE}" >> ${CONFIG} fi echo 'Current size: '${NEW_SIZE}'. Please reboot.' else diff --git a/system_files/desktop/shared/usr/etc/profile.d/askpass.sh b/system_files/desktop/shared/usr/etc/profile.d/askpass.sh deleted file mode 100755 index a1d514e4..00000000 --- a/system_files/desktop/shared/usr/etc/profile.d/askpass.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_INFO="/usr/share/ublue-os/image-info.json" -BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO) - -if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then - SUDO_ASKPASS='/usr/bin/ksshaskpass' -elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass' -fi -export SUDO_ASKPASS diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml index 9b1ac1cc..24f54513 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml +++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml @@ -45,7 +45,7 @@ screens: description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible default: false packages: - - Install Nix Package Support: sudo -A just --unstable install-nix + - Install Nix Package Support: pkexec just --justfile /usr/share/ublue-os/justfile --unstable install-nix - Install Fleek (Requires Nix): just --unstable install-fleek OpenRazer: description: Enables additional capabilities for Razer Hardware