some enhancements

Signed-off-by: David P <megver83@parabola.nu>

13 files changed, 16 insertions, 30 deletions

diff --git a/configs/lxde-openrc/airootfs/etc/motd b/configs/lxde-openrc/airootfs/etc/motd
index 4c7a45d..e3d2947 100644
--- a/configs/lxde-openrc/airootfs/etc/motd
+++ b/configs/lxde-openrc/airootfs/etc/motd
@@ -1,8 +1,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 Wi-Fi, authenticate to the wireless network using the nmtui-connect utility.
+Ethernet and Wi-Fi connections using NetworkManager should work automatically.
 
 After connecting to the internet, the installation guide can be accessed
 via the convenience script Installation_guide.
diff --git a/configs/lxde-openrc/airootfs/root/.keymap.sh b/configs/lxde-openrc/airootfs/root/.keymap.sh
index c6ed5fd..3b1516b 100755
--- a/configs/lxde-openrc/airootfs/root/.keymap.sh
+++ b/configs/lxde-openrc/airootfs/root/.keymap.sh
@@ -5,7 +5,8 @@ code="$(grep XKBMAP= .codecheck | cut -d '=' -f 2)"
 keymaps_list="$(sed -e '/! layout/,/^$/!d;/! layout/d;s/ /_/g;s/__/ /g;s/ _//' /usr/share/X11/xkb/rules/evdev.lst | sort)"
 
 if [[ $code = "0" ]]; then
-	keymap=$(zenity --list --title="Select your keymap" --column="Code Name" --column="Keymap" --hide-column=1 "$keymaps_list")
+	# shellcheck disable=SC2086
+	keymap="$(zenity --list --title='Select your keymap' --column='Code Name' --column='Keymap' --hide-column=1 $keymaps_list)"
 	setxkbmap "$keymap"
 
 	#Save XKBMAP in .codecheck to use in other time. For example if you install X11 with scripts
diff --git a/configs/lxde-openrc/airootfs/root/.zlogin b/configs/lxde-openrc/airootfs/root/.zlogin
index 7eab09f..5d71278 100644
--- a/configs/lxde-openrc/airootfs/root/.zlogin
+++ b/configs/lxde-openrc/airootfs/root/.zlogin
@@ -3,5 +3,6 @@
 
 ~/.automated_script.sh
 ~/.language.sh
-export $(cat /etc/locale.conf)
+. /etc/locale.conf
+export LANG
 startx
diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both
index e16941f..7ba7e18 100644
--- a/configs/lxde-openrc/packages.both
+++ b/configs/lxde-openrc/packages.both
@@ -29,6 +29,7 @@ iwd
 jfsutils
 kitty-terminfo
 lftp
+libelogind
 linux-atm
 linux-libre
 linux-libre
@@ -88,6 +89,7 @@ wpa_supplicant-openrc
 wvdial
 xfsprogs
 xl2tpd
+your-initfreedom
 zsh
 
 #X11
@@ -137,6 +139,7 @@ dmidecode
 xscreensaver
 zenity
 xterm
+dialog
 
 #Compressor/archiver
 p7zip
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
index 819dd56..f1996bb 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
@@ -1,9 +1,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-DEFAULT parabola32
-TIMEOUT 30
-
 LABEL parabola32
 TEXT HELP
 Boot the Parabola GNU/Linux-libre (i686) live medium.
diff --git a/configs/releng-openrc/airootfs/etc/motd b/configs/releng-openrc/airootfs/etc/motd
index 4c7a45d..e3d2947 100644
--- a/configs/releng-openrc/airootfs/etc/motd
+++ b/configs/releng-openrc/airootfs/etc/motd
@@ -1,8 +1,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 Wi-Fi, authenticate to the wireless network using the nmtui-connect utility.
+Ethernet and Wi-Fi connections using NetworkManager 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/packages.both b/configs/releng-openrc/packages.both
index 9d9ecaa..8803036 100644
--- a/configs/releng-openrc/packages.both
+++ b/configs/releng-openrc/packages.both
@@ -28,6 +28,7 @@ iwd
 jfsutils
 kitty-terminfo
 lftp
+libelogind
 linux-atm
 linux-libre
 linux-libre
@@ -87,4 +88,5 @@ wpa_supplicant-openrc
 wvdial
 xfsprogs
 xl2tpd
+your-initfreedom
 zsh
diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg
index 819dd56..f1996bb 100644
--- a/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg
+++ b/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg
@@ -1,9 +1,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-DEFAULT parabola32
-TIMEOUT 30
-
 LABEL parabola32
 TEXT HELP
 Boot the Parabola GNU/Linux-libre (i686) live medium.
diff --git a/configs/releng/syslinux/parabolaiso_sys32.cfg b/configs/releng/syslinux/parabolaiso_sys32.cfg
index 819dd56..f1996bb 100644
--- a/configs/releng/syslinux/parabolaiso_sys32.cfg
+++ b/configs/releng/syslinux/parabolaiso_sys32.cfg
@@ -1,9 +1,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-DEFAULT parabola32
-TIMEOUT 30
-
 LABEL parabola32
 TEXT HELP
 Boot the Parabola GNU/Linux-libre (i686) live medium.
diff --git a/configs/talkingparabola/airootfs/etc/systemd/system/brltty.service b/configs/talkingparabola/airootfs/etc/systemd/system/brltty.service
deleted file mode 120000
index f466627..0000000
--- a/configs/talkingparabola/airootfs/etc/systemd/system/brltty.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/brltty.service
\ No newline at end of file
diff --git a/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg b/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg
index d423907..ec49748 100644
--- a/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg
+++ b/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg
@@ -1,15 +1,12 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-DEFAULT parabola32speech
-TIMEOUT 30
-
 LABEL parabola32speech
 TEXT HELP
 Boot the Parabola GNU/Linux-libre (i686) live medium with speakup enabled.
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance using texto-to-speech feedback.
 ENDTEXT
-MENU LABEL Boot Parabola GNU/Linux-libre (i686) wih texto-to-speech
+MENU LABEL Boot Parabola GNU/Linux-libre (i686) wih text-to-speech
 LINUX boot/i686/vmlinuz-linux-libre
 INITRD boot/i686/parabolaiso.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft
diff --git a/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg b/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg
index 16a34fe..c235929 100644
--- a/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg
+++ b/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg
@@ -9,7 +9,7 @@ TEXT HELP
 Boot the Parabola GNU/Linux-libre (x86_64) live medium with speakup enabled.
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance using texto-to-speech feedback.
 ENDTEXT
-MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) with texto-to-speech
+MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) with text-to-speech
 LINUX boot/x86_64/vmlinuz-linux-libre
 INITRD boot/x86_64/parabolaiso.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index f3a9765..f5b7e20 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -21,7 +21,6 @@ out_dir="out"
 sfs_mode="sfs"
 sfs_comp="xz"
 gpg_key=
-init=systemd
 
 # Show an INFO message
 # $1: message string
@@ -46,11 +45,7 @@ _msg_error() {
 
 _chroot_init() {
     mkdir -p ${work_dir}/airootfs
-    case $init in
-        openrc) _pacman base syslinux openrc-init ;;
-        sysvinit) _pacman base syslinux openrc-sysvinit ;;
-        systemd) _pacman base syslinux ;;
-    esac
+    _pacman base syslinux
 }
 
 _chroot_run() {
@@ -102,8 +97,6 @@ _usage ()
     echo "                     Default: ${sfs_mode}"
     echo "    -c <comp_type>   Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)"
     echo "                     Default: '${sfs_comp}'"
-    echo "    -i <init>        Init system to use"
-    echo "                     Default: '${init}'"
     echo "    -v               Enable verbose output"
     echo "    -h               This message"
     echo " commands:"
@@ -412,7 +405,6 @@ while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:i:vh' arg; do
         s) sfs_mode="${OPTARG}" ;;
         c) sfs_comp="${OPTARG}" ;;
         g) gpg_key="${OPTARG}" ;;
-        i) init="${OPTARG}" ;;
         v) quiet="n" ;;
         h|?) _usage 0 ;;
         *)