summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-07-11 17:03:19 +0300
committernl6720 <nl6720@gmail.com>2020-07-11 17:08:44 +0300
commit550aca712432c6708fc48db5e9a8aaba9ef1e0c1 (patch)
treea093e9b3ede98a9f0d14c1f1cad7c0df241500ad
parent8b4e987e179833ce5c6ad47c561d179bc79a7a54 (diff)
downloadarchiso32-550aca712432c6708fc48db5e9a8aaba9ef1e0c1.tar.xz
Remove lynx usage in configs/releng/build.sh
/usr/local/bin/Installation_guide: Add a convenience script which opens the installation guide in lynx. /etc/motd: Provide a message with minimal instructions for connecting to internet and inform about the Installation_guide convenience script.
-rw-r--r--configs/releng/airootfs/etc/motd9
-rw-r--r--configs/releng/airootfs/root/install.txt3
-rwxr-xr-xconfigs/releng/airootfs/usr/local/bin/Installation_guide3
-rwxr-xr-xconfigs/releng/build.sh3
-rw-r--r--configs/releng/packages.x86_642
5 files changed, 13 insertions, 7 deletions
diff --git a/configs/releng/airootfs/etc/motd b/configs/releng/airootfs/etc/motd
new file mode 100644
index 0000000..417b050
--- /dev/null
+++ b/configs/releng/airootfs/etc/motd
@@ -0,0 +1,9 @@
+To install Arch Linux follow the installation guide:
+https://wiki.archlinux.org/index.php/Installation_guide
+
+For Wi-Fi, authenticate to the wireless network using the iwctl utility.
+Ethernet and Wi-Fi connections 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/root/install.txt b/configs/releng/airootfs/root/install.txt
deleted file mode 100644
index 3c8f171..0000000
--- a/configs/releng/airootfs/root/install.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-View this installation guide online at
-https://wiki.archlinux.org/index.php/Installation_Guide
-
diff --git a/configs/releng/airootfs/usr/local/bin/Installation_guide b/configs/releng/airootfs/usr/local/bin/Installation_guide
new file mode 100755
index 0000000..cd38645
--- /dev/null
+++ b/configs/releng/airootfs/usr/local/bin/Installation_guide
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec lynx 'https://wiki.archlinux.org/index.php/Installation_guide'
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 7974ab1..51401ed 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -120,9 +120,6 @@ make_customize_airootfs() {
cp "${script_path}/pacman.conf" "${work_dir}/x86_64/airootfs/etc"
- lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> \
- "${work_dir}/x86_64/airootfs/root/install.txt"
-
if [ -n "${verbose}" ]; then
mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-r '/root/customize_airootfs.sh' run
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index ba07772..6330d4a 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -14,7 +14,6 @@ dmraid
dnsmasq
dosfstools
efibootmgr
-elinks
ethtool
exfat-utils
f2fs-tools
@@ -35,6 +34,7 @@ linux-atm
linux-firmware
lsscsi
lvm2
+lynx
man-db
man-pages
mc