update CHANGELOG

CHANGELOG

@@ -16,16 +16,19 @@ Environment Changes:
 - disabled/masked systemd targets:
   cryptsetup first-boot-complete integritysetup swap veritysetup
 - disabled/masked systemd services:
-  hwdb-update firstboot machine-id-commit pcrmachine  binfmt boot-random-seed
-  repart pcrphase pcrphase-sysinit
+  binfmt boot-random-seed firstboot hwdb-update machine-id-commit
+  pcrmachine pcrphase pcrphase-sysinit repart
 - disabled/masked nfs3 support:
   rpcbind.service, rpcbind.socket, rpcbind.target and nfs-server.service
-- switch to default.target -> graphical.target
+- switch to default graphical.target
 - only mount /dev/sr0 on detection
 - unmount /dev/sr0 and UUID 1234-ABCD after copying initramfs files
 - fixed ethernet firmware loading
 - included /drivers/net/usb modules
-- renamed grub entries
+- renamed grub menu entries
+- updated /etc/motd
+- updated /etc/issue
+- fixed /etc/os-release
 update-installer.sh:
 - updated messages on -full-system call
 - updated elinks, chromium and firefox starting page to archboot.com
@@ -40,7 +43,8 @@ setup:
 - added EXIT menu with options
 - cleaned up partition functions
 - fixed mountpoint checks on EFI directory
-- fixed /efi /boot mounting order in autoprepare mode
+- renamed Auto-Prepare to Quick Setup
+- fixed /efi /boot mounting order in quick setup mode
 ---
 2023.05 Highlights:
 - linux 6.3.x

usr/bin/archboot-locale.sh

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # written by Tobias Powalowski <tpowa@archlinux.org>
 _ANSWER="/tmp/.locale"
-_TITLE="Archboot Arch Linux --> System Wide Locale Setting"
+_TITLE="Archboot | Arch Linux Setup | System Wide Locale Setting"
 # _dialog()
 # an el-cheapo dialog wrapper
 #

usr/lib/archboot/cpio.sh

@@ -355,16 +355,6 @@ initialize_buildroot() {
     # mount tables
     ln -s ../proc/self/mounts "$buildroot/etc/mtab"
     : >"$buildroot/etc/fstab"
-    # add os-release for systemd
-    if [[ -e /etc/os-release ]]; then
-        if [[ -L /etc/os-release ]]; then
-            osreleasefile="$(realpath -- /etc/os-release)"
-            install -Dm0644 "$osreleasefile" "${buildroot}${osreleasefile}"
-            cp -adT /etc/os-release "${buildroot}/etc/os-release"
-        else
-            install -Dm0644 /etc/os-release "${buildroot}/etc/os-release"
-        fi
-    fi
     # add a blank ld.so.conf to keep ldconfig happy
     : >"$buildroot/etc/ld.so.conf"
     printf '%s' "$workdir"

usr/lib/initcpio/install/archboot_base_common

@@ -47,7 +47,7 @@ build ()
 
     ### adding config files of installation system
     map add_file "/etc/profile" "/etc/shells"
-    basic_config="os-release hostname modprobe.d/modprobe.conf tmpfiles.d/var.conf"
+    basic_config="hostname issue modprobe.d/modprobe.conf os-release tmpfiles.d/var.conf"
     for i in $basic_config; do
         add_file "/usr/share/archboot/base/etc/${i}" "/etc/${i}"
     done

usr/lib/initcpio/install/archboot_motd

@@ -12,31 +12,29 @@ build ()
     #shellcheck disable=SC2129
     echo -e "\e[1m----------------------------------------\e[m" >> "${MOTD}"
     echo -e "\e[1mConsole Configuration:\e[m" >> "${MOTD}"
-    echo -e "  - Virtual consoles \e[1m1-6\e[m are active." >> "${MOTD}"
-    echo -e "  - To change virtual console use \e[1;92mALT + F(1-6)\e[m" >> "${MOTD}"
+    echo -e "  - Use the \e[1;92mALT + F1 - F6\e[m keys to change the virtual console." >> "${MOTD}"
 if  echo "${HOOKS[@]}" | grep -qw archboot_keymap ; then
-    echo -e "  - To change to a non-US keymap, type \e[1;92m'km'\e[m at the console." >> "${MOTD}"
+    echo -e "  - Use the \e[1;92m'km'\e[m script to change to a non-US keymap." >> "${MOTD}"
 fi
 if  echo "${HOOKS[@]}" | grep -qw archboot_tz; then
     echo -e "\e[1mClock Configuration:\e[m" >> "${MOTD}"
-    echo -e "  - To change your time and date, type \e[1;92m'tz'\e[m at the console." >> "${MOTD}"
+    echo -e "  - Use the \e[1;92m'tz'\e[m script to change your time and date." >> "${MOTD}"
 fi
 if  echo "${HOOKS[@]}" | grep -qw archboot_net; then
     #shellcheck disable=SC2129
-    echo -e "\e[1mFor Wi-Fi Authentification Or Online Help:\e[m" >> "${MOTD}"
+    echo -e "\e[1mFor Additional Wi-Fi Authentification Or Online Help:\e[m" >> "${MOTD}"
     echo -e "  - Use the \e[1;92m'elinks'\e[m text mode browser." >> "${MOTD}"
-    echo -e "\e[1mIRC Channel Support:\e[m" >> "${MOTD}"
+    echo -e "\e[1mIRC Support Channel:\e[m" >> "${MOTD}"
     echo -e "  - Use the \e[1;92m'weechat'\e[m IRC client." >> "${MOTD}"
 fi
 if  echo "${HOOKS[@]}" | grep -qw archboot_installer; then
     echo -e "\e[1mManage Archboot Environment:\e[m" >> "${MOTD}"
-    echo -e "  - Run \e[1;92m'update-installer'\e[m to manage the Archboot Environment." >> "${MOTD}"
+    echo -e "  - Use the \e[1;92m'update-installer'\e[m script." >> "${MOTD}"
     #shellcheck disable=SC2129
     echo -e "\e[1mInstallation:\e[m" >> "${MOTD}"
-    echo -e "  - On first login \e[92m'setup'\e[m is launched automatically." >> "${MOTD}"
-    echo -e "  - Rerun \e[1;92m'setup'\e[m to continue installation." >> "${MOTD}"
-    echo -e "\e[1mFor Experts:\e[m" >> "${MOTD}"
-    echo -e "  - Use \e[1;92m'quickinst'\e[m to install and bypass the setup routine." >> "${MOTD}"
+    echo -e "  - Use the \e[92m'setup'\e[m script." >> "${MOTD}"
+    echo -e "\e[1mInstallation For Experts:\e[m" >> "${MOTD}"
+    echo -e "  - Use the \e[1;92m'quickinst'\e[m script." >> "${MOTD}"
 fi
     chmod 644 "${MOTD}"
     add_file "${MOTD}" "/etc/motd"

usr/share/archboot/base/etc/issue

@@ -0,0 +1 @@
+\e[1mLogin on \l | \r | \t | \d\e[m

usr/share/archboot/base/etc/os-release

@@ -1,5 +1,5 @@
-NAME="Archboot - Arch Linux"
-PRETTY_NAME="Archboot - Arch Linux"
+NAME="Archboot"
+PRETTY_NAME="Archboot"
 ID=arch
 BUILD_ID=rolling
 ANSI_COLOR="38;2;23;147;209"

usr/share/archboot/base/init

@@ -107,7 +107,7 @@ mv /lib/firmware /sysroot/usr/lib
 cd /sysroot || _emergency_shell
 bsdcpio -u -f "*/lib/modules/" -f "*/lib/firmware/" -i <"/mnt/boot/initramfs-$(uname -m).img" &>/dev/null || _emergency_shell
 # unmount everything after copying
-echo -e "\e[1mStep 7/7:\e[m Unmounting archboot rootfs on usb/hd/cdrom device..."
+echo -e "\e[1mStep 7/7:\e[m Unmounting archboot rootfs..."
 umount -q -A /dev/sr0
 umount -q -A UUID=1234-ABCD
 echo 0 > /proc/sys/kernel/sysrq