infong/debi
1
0
Fork 0
mirror of https://github.com/bohanyang/debi.git synced 2026-09-26 22:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert

Browse Source
This commit is contained in:
Bohan Yang
2023-08-26 09:53:12 +00:00
parent 005754ffe8
commit 058edd7904
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debi.sh
+11 -1
View File
@@ -502,6 +502,15 @@ done
[ -n "$authorized_keys_url" ] && ! download "$authorized_keys_url" /dev/null && [ -n "$authorized_keys_url" ] && ! download "$authorized_keys_url" /dev/null &&
err "Failed to download SSH authorized public keys from \"$authorized_keys_url\"" err "Failed to download SSH authorized public keys from \"$authorized_keys_url\""
non_free_firmware_available=false
case $suite in
bookworm|stable|trixie|testing|sid|unstable)
non_free_firmware_available=true
;;
*)
apt_non_free_firmware=false
esac
apt_components=main apt_components=main
[ "$apt_contrib" = true ] && apt_components="$apt_components contrib" [ "$apt_contrib" = true ] && apt_components="$apt_components contrib"
[ "$apt_non_free" = true ] && apt_components="$apt_components non-free" [ "$apt_non_free" = true ] && apt_components="$apt_components non-free"
@@ -771,13 +780,14 @@ $save_preseed << EOF
# Apt setup # Apt setup
d-i apt-setup/non-free-firmware boolean $apt_non_free_firmware
d-i apt-setup/contrib boolean $apt_contrib d-i apt-setup/contrib boolean $apt_contrib
d-i apt-setup/non-free boolean $apt_non_free d-i apt-setup/non-free boolean $apt_non_free
d-i apt-setup/enable-source-repositories boolean $apt_src d-i apt-setup/enable-source-repositories boolean $apt_src
d-i apt-setup/services-select multiselect $apt_services d-i apt-setup/services-select multiselect $apt_services
EOF EOF
[ "$non_free_firmware_available" = true ] && echo "d-i apt-setup/non-free-firmware boolean $apt_non_free_firmware" | $save_preseed
# If not sid/unstable # If not sid/unstable
[ -n "$security_archive" ] && { [ -n "$security_archive" ] && {
$save_preseed << EOF $save_preseed << EOF