From 64f4b3375cc0f1ed2a7e199dc9ea283b22d922b9 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 5 Apr 2021 19:53:47 -0400 Subject: sync with archiso Imported changes: c859978 (HEAD -> master, origin/master, origin/HEAD) Revert "configs/releng: improve UX" 495721a (tag: v52) Add changelog entry for v52 8b6f354 configs/releng: improve UX 9875249 releng/packages: Add archinstall to the list of packages bc007ca Add releases section with PGP information d178183 Reduce amount of checked mirrors 0664efc Allow redirects for scripts d86f860 configs/releng: add and enable ModemManager 2c9eabd configs/releng: start DHCP client for mobile broadband edfb50a configs/releng: rename 20-wireless.network to 20-wlan.network Parabola changes: * lxde-openrc: update profiledef.sh Signed-off-by: David P --- .../etc/NetworkManager/dispatcher.d/reflector | 2 +- .../lxde-openrc/airootfs/root/.automated_script.sh | 2 +- configs/lxde-openrc/airootfs/root/.language.sh | 5 ++++- configs/lxde-openrc/packages.both | 2 ++ configs/lxde-openrc/profiledef.sh | 19 +++++++++++++++++++ .../etc/NetworkManager/dispatcher.d/reflector | 2 +- configs/releng-openrc/airootfs/etc/motd | 4 ++-- .../releng-openrc/airootfs/root/.automated_script.sh | 2 +- configs/releng-openrc/packages.both | 2 ++ configs/releng/airootfs/etc/motd | 4 ++-- .../airootfs/etc/systemd/network/20-wwan.network | 15 +++++++++++++++ .../system/dbus-org.freedesktop.ModemManager1.service | 1 + .../multi-user.target.wants/ModemManager.service | 1 + .../releng/airootfs/etc/xdg/reflector/reflector.conf | 2 +- configs/releng/airootfs/root/.automated_script.sh | 2 +- configs/releng/packages.both | 2 ++ 16 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 configs/releng/airootfs/etc/systemd/network/20-wwan.network create mode 120000 configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service (limited to 'configs') diff --git a/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector b/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector index 5618511..7287520 100755 --- a/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector +++ b/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector @@ -6,6 +6,6 @@ if [ "$2" == up ] && ! grep -qoP 'mirror=\K\S+' /proc/cmdline; then reflector \ --save /etc/pacman.d/mirrorlist \ --protocol https \ - --latest 70 \ + --latest 20 \ --sort rate fi diff --git a/configs/lxde-openrc/airootfs/root/.automated_script.sh b/configs/lxde-openrc/airootfs/root/.automated_script.sh index ed3a924..5c0c316 100755 --- a/configs/lxde-openrc/airootfs/root/.automated_script.sh +++ b/configs/lxde-openrc/airootfs/root/.automated_script.sh @@ -16,7 +16,7 @@ automated_script () script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then - curl "${script}" --retry-connrefused -s -o /tmp/startup_script >/dev/null + curl "${script}" --location --retry-connrefused -s -o /tmp/startup_script >/dev/null rt=$? else cp "${script}" /tmp/startup_script diff --git a/configs/lxde-openrc/airootfs/root/.language.sh b/configs/lxde-openrc/airootfs/root/.language.sh index acce4bb..cc4558f 100755 --- a/configs/lxde-openrc/airootfs/root/.language.sh +++ b/configs/lxde-openrc/airootfs/root/.language.sh @@ -28,5 +28,8 @@ if [ "$code" = "0" ]; then *) cp -a ~/.scriptsInstallation/language/en/* ~/.scriptsInstallation/ cp ~/.scriptsInstallation/install.sh ~/ ;; - esac + esac + + #Clear the dialog menu + clear fi diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both index 1d91863..cdd04e1 100644 --- a/configs/lxde-openrc/packages.both +++ b/configs/lxde-openrc/packages.both @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later #Base alsa-utils-openrc +archinstall arch-install-scripts base bind-tools @@ -51,6 +52,7 @@ memtest86+ mkinitcpio mkinitcpio-parabolaiso mkinitcpio-nfs-utils +modemmanager mtools nano nbd diff --git a/configs/lxde-openrc/profiledef.sh b/configs/lxde-openrc/profiledef.sh index 62f60d8..31a505c 100644 --- a/configs/lxde-openrc/profiledef.sh +++ b/configs/lxde-openrc/profiledef.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 +# TODO: +# * replace the old installation scripts with Zen Installer +# * get braille support to actually work, even for desktop + iso_name="parabola-openrc-lxde" iso_label="PARA_$(date +%Y%m)" iso_publisher="Parabola GNU/Linux-libre " @@ -21,6 +25,21 @@ file_permissions=( ["/etc/shadow"]="0:0:400" ["/root"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" + ["/root/.keymap.sh"]="0:0:755" + ["/root/.language.sh"]="0:0:755" + ["/root/Desktop/Parabola Installation CLI.desktop"]="0:0:755" + ["/root/.scriptsInstallation/language/en/install.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/en/systemConfig.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/en/systemConfig.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/es/install.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/es/systemConfig.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/es/systemConfig.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/gl/install.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/gl/systemConfig.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/gl/systemConfig.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/pt/install.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/pt/systemConfig.sh"]="0:0:755" + ["/root/.scriptsInstallation/language/pt/systemConfig.sh"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" diff --git a/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector b/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector index 5618511..7287520 100755 --- a/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector +++ b/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector @@ -6,6 +6,6 @@ if [ "$2" == up ] && ! grep -qoP 'mirror=\K\S+' /proc/cmdline; then reflector \ --save /etc/pacman.d/mirrorlist \ --protocol https \ - --latest 70 \ + --latest 20 \ --sort rate fi diff --git a/configs/releng-openrc/airootfs/etc/motd b/configs/releng-openrc/airootfs/etc/motd index e3d2947..ee664e2 100644 --- a/configs/releng-openrc/airootfs/etc/motd +++ b/configs/releng-openrc/airootfs/etc/motd @@ -2,8 +2,8 @@ To install Parabola GNU/Linux-libre follow the installation guide: https://wiki.parabola.nu/Installation_Guide For Wi-Fi, authenticate to the wireless network using the nmtui-connect utility. -Ethernet and Wi-Fi connections using NetworkManager should work automatically. +For mobile broadband (WWAN) modems, connect with the mmcli utility. +Ethernet, WLAN and WWAN interfaces using DHCP should work automatically. After connecting to the internet, the installation guide can be accessed via the convenience script Installation_guide. - diff --git a/configs/releng-openrc/airootfs/root/.automated_script.sh b/configs/releng-openrc/airootfs/root/.automated_script.sh index ed3a924..5c0c316 100755 --- a/configs/releng-openrc/airootfs/root/.automated_script.sh +++ b/configs/releng-openrc/airootfs/root/.automated_script.sh @@ -16,7 +16,7 @@ automated_script () script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then - curl "${script}" --retry-connrefused -s -o /tmp/startup_script >/dev/null + curl "${script}" --location --retry-connrefused -s -o /tmp/startup_script >/dev/null rt=$? else cp "${script}" /tmp/startup_script diff --git a/configs/releng-openrc/packages.both b/configs/releng-openrc/packages.both index f2f848e..cdd7a3d 100644 --- a/configs/releng-openrc/packages.both +++ b/configs/releng-openrc/packages.both @@ -1,6 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later alsa-utils-openrc +archinstall arch-install-scripts base bind-tools @@ -50,6 +51,7 @@ memtest86+ mkinitcpio mkinitcpio-parabolaiso mkinitcpio-nfs-utils +modemmanager mtools nano nbd diff --git a/configs/releng/airootfs/etc/motd b/configs/releng/airootfs/etc/motd index 4c7a45d..e94c5c5 100644 --- a/configs/releng/airootfs/etc/motd +++ b/configs/releng/airootfs/etc/motd @@ -2,8 +2,8 @@ To install Parabola GNU/Linux-libre follow the installation guide: https://wiki.parabola.nu/Installation_Guide For Wi-Fi, authenticate to the wireless network using the iwctl utility. -Ethernet and Wi-Fi connections using DHCP should work automatically. +For mobile broadband (WWAN) modems, connect with the mmcli utility. +Ethernet, WLAN and WWAN interfaces using DHCP should work automatically. After connecting to the internet, the installation guide can be accessed via the convenience script Installation_guide. - diff --git a/configs/releng/airootfs/etc/systemd/network/20-wwan.network b/configs/releng/airootfs/etc/systemd/network/20-wwan.network new file mode 100644 index 0000000..cc946fe --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/network/20-wwan.network @@ -0,0 +1,15 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +[Match] +Type=wwan + +[Network] +DHCP=yes +IPv6PrivacyExtensions=yes + +[DHCPv4] +RouteMetric=2048 + +[DHCPv6] +RouteMetric=2048 diff --git a/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service new file mode 120000 index 0000000..dcf7c8e --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/ModemManager.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service new file mode 120000 index 0000000..dcf7c8e --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/ModemManager.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/xdg/reflector/reflector.conf b/configs/releng/airootfs/etc/xdg/reflector/reflector.conf index 7b37d89..9a72b0d 100644 --- a/configs/releng/airootfs/etc/xdg/reflector/reflector.conf +++ b/configs/releng/airootfs/etc/xdg/reflector/reflector.conf @@ -2,5 +2,5 @@ --save /etc/pacman.d/mirrorlist --protocol https ---latest 70 +--latest 20 --sort rate diff --git a/configs/releng/airootfs/root/.automated_script.sh b/configs/releng/airootfs/root/.automated_script.sh index ed3a924..5c0c316 100755 --- a/configs/releng/airootfs/root/.automated_script.sh +++ b/configs/releng/airootfs/root/.automated_script.sh @@ -16,7 +16,7 @@ automated_script () script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then - curl "${script}" --retry-connrefused -s -o /tmp/startup_script >/dev/null + curl "${script}" --location --retry-connrefused -s -o /tmp/startup_script >/dev/null rt=$? else cp "${script}" /tmp/startup_script diff --git a/configs/releng/packages.both b/configs/releng/packages.both index b366e4d..087d37d 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -1,6 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later alsa-utils +archinstall arch-install-scripts base bind-tools @@ -49,6 +50,7 @@ memtest86+ mkinitcpio mkinitcpio-parabolaiso mkinitcpio-nfs-utils +modemmanager mtools nano nbd -- cgit v1.2.2