diff --git a/airootfs/etc/hostname b/airootfs/etc/hostname index 2dbe21e..6f1b0e7 100644 --- a/airootfs/etc/hostname +++ b/airootfs/etc/hostname @@ -1 +1 @@ -archiso +naviso \ No newline at end of file diff --git a/airootfs/etc/motd b/airootfs/etc/motd index 4d9eda1..deb78db 100644 --- a/airootfs/etc/motd +++ b/airootfs/etc/motd @@ -1,11 +1,3 @@ -To install Arch Linux follow the installation guide: -https://wiki.archlinux.org/title/Installation_guide +Welcome to navOS! -For Wi-Fi, authenticate to the wireless network using the iwctl utility. -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. - -                                           +You can install the system with `navinstall`. diff --git a/airootfs/usr/local/bin/Installation_guide b/airootfs/usr/local/bin/Installation_guide deleted file mode 100755 index 4266754..0000000 --- a/airootfs/usr/local/bin/Installation_guide +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -# SPDX-License-Identifier: GPL-3.0-or-later - -exec lynx 'https://wiki.archlinux.org/title/Installation_guide' diff --git a/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/efiboot/loader/entries/01-archiso-x86_64-linux.conf index bc8ab33..a6e0238 100644 --- a/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,4 +1,4 @@ -title Arch Linux install medium (x86_64, UEFI) +title navOS install medium (x86_64, UEFI) sort-key 01 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img diff --git a/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index c0cb1c8..116795b 100644 --- a/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -1,4 +1,4 @@ -title Arch Linux install medium (x86_64, UEFI) with speech +title navOS install medium (x86_64, UEFI) with speech sort-key 02 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img diff --git a/grub/grub.cfg b/grub/grub.cfg deleted file mode 100644 index 25194a3..0000000 --- a/grub/grub.cfg +++ /dev/null @@ -1,107 +0,0 @@ -# Load partition table and file system modules -insmod part_gpt -insmod part_msdos -insmod fat -insmod iso9660 -insmod ntfs -insmod ntfscomp -insmod exfat -insmod udf - -# Use graphics-mode output -if loadfont "${prefix}/fonts/unicode.pf2" ; then - insmod all_video - set gfxmode="auto" - terminal_input console - terminal_output console -fi - -# Enable serial console -insmod serial -insmod usbserial_common -insmod usbserial_ftdi -insmod usbserial_pl2303 -insmod usbserial_usbdebug -if serial --unit=0 --speed=115200; then - terminal_input --append serial - terminal_output --append serial -fi - -# Get a human readable platform identifier -if [ "${grub_platform}" == 'efi' ]; then - archiso_platform='UEFI' - if [ "${grub_cpu}" == 'x86_64' ]; then - archiso_platform="x64 ${archiso_platform}" - elif [ "${grub_cpu}" == 'i386' ]; then - archiso_platform="IA32 ${archiso_platform}" - else - archiso_platform="${grub_cpu} ${archiso_platform}" - fi -elif [ "${grub_platform}" == 'pc' ]; then - archiso_platform='BIOS' -else - archiso_platform="${grub_cpu} ${grub_platform}" -fi - -# Set default menu entry -default=archlinux -timeout=15 -timeout_style=menu - - -# Menu entries - -menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - -menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - - -if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then - menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 - linux /boot/memtest86+/memtest.efi - } -fi -if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then - menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 - linux /boot/memtest86+/memtest - } -fi -if [ "${grub_platform}" == 'efi' ]; then - if [ "${grub_cpu}" == 'x86_64' -a -f '/shellx64.efi' ]; then - menuentry 'UEFI Shell' --class efi { - chainloader /shellx64.efi - } - elif [ "${grub_cpu}" == "i386" -a -f '/shellia32.efi' ]; then - menuentry 'UEFI Shell' --class efi { - chainloader /shellia32.efi - } - fi - - menuentry 'UEFI Firmware Settings' --id 'uefi-firmware' { - fwsetup - } -fi - -menuentry 'System shutdown' --class shutdown --class poweroff { - echo 'System shutting down...' - halt -} - -menuentry 'System restart' --class reboot --class restart { - echo 'System rebooting...' - reboot -} - - -# GRUB init tune for accessibility -play 600 988 1 1319 4 diff --git a/grub/loopback.cfg b/grub/loopback.cfg deleted file mode 100644 index d7d5ece..0000000 --- a/grub/loopback.cfg +++ /dev/null @@ -1,80 +0,0 @@ -# https://www.supergrubdisk.org/wiki/Loopback.cfg - -# Search for the ISO volume -search --no-floppy --set=archiso_img_dev --file "${iso_path}" -probe --set archiso_img_dev_uuid --fs-uuid "${archiso_img_dev}" - -# Get a human readable platform identifier -if [ "${grub_platform}" == 'efi' ]; then - archiso_platform='UEFI' - if [ "${grub_cpu}" == 'x86_64' ]; then - archiso_platform="x64 ${archiso_platform}" - elif [ "${grub_cpu}" == 'i386' ]; then - archiso_platform="IA32 ${archiso_platform}" - else - archiso_platform="${grub_cpu} ${archiso_platform}" - fi -elif [ "${grub_platform}" == 'pc' ]; then - archiso_platform='BIOS' -else - archiso_platform="${grub_cpu} ${grub_platform}" -fi - -# Set default menu entry -default=archlinux -timeout=15 -timeout_style=menu - - -# Menu entries - -menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - -menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - - -if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then - menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 - linux /boot/memtest86+/memtest.efi - } -fi -if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then - menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 - linux /boot/memtest86+/memtest - } -fi -if [ "${grub_platform}" == 'efi' ]; then - if [ "${grub_cpu}" == 'x86_64' -a -f '/shellx64.efi' ]; then - menuentry 'UEFI Shell' --class efi { - chainloader /shellx64.efi - } - elif [ "${grub_cpu}" == "i386" -a -f '/shellia32.efi' ]; then - menuentry 'UEFI Shell' --class efi { - chainloader /shellia32.efi - } - fi - - menuentry 'UEFI Firmware Settings' --id 'uefi-firmware' { - fwsetup - } -fi - -menuentry 'System shutdown' --class shutdown --class poweroff { - echo 'System shutting down...' - halt -} - -menuentry 'System restart' --class reboot --class restart { - echo 'System rebooting...' - reboot -} diff --git a/profiledef.sh b/profiledef.sh index ce26e79..7073717 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -1,15 +1,14 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 -iso_name="archlinux" -iso_label="ARCH_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" -iso_publisher="Arch Linux " -iso_application="Arch Linux Live/Rescue DVD" +iso_name="navos" +iso_label="NAV_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" +iso_publisher="Hydra navOS " +iso_application="Hydra navOS Live/Rescue ISO" iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" -install_dir="arch" +install_dir="nav" buildmodes=('iso') -bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' - 'uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp' +bootmodes=('uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp' 'uefi-ia32.systemd-boot.eltorito' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" pacman_conf="pacman.conf" diff --git a/syslinux/archiso_head.cfg b/syslinux/archiso_head.cfg deleted file mode 100644 index 671ab4e..0000000 --- a/syslinux/archiso_head.cfg +++ /dev/null @@ -1,28 +0,0 @@ -SERIAL 0 115200 -UI vesamenu.c32 -MENU TITLE Arch Linux -MENU BACKGROUND splash.png - -MENU WIDTH 78 -MENU MARGIN 4 -MENU ROWS 7 -MENU VSHIFT 10 -MENU TABMSGROW 14 -MENU CMDLINEROW 14 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW 29 - -# Refer to https://wiki.syslinux.org/wiki/index.php/Comboot/menu.c32 - -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std - -MENU CLEAR -MENU IMMEDIATE diff --git a/syslinux/archiso_pxe-linux.cfg b/syslinux/archiso_pxe-linux.cfg deleted file mode 100644 index 5d0f741..0000000 --- a/syslinux/archiso_pxe-linux.cfg +++ /dev/null @@ -1,32 +0,0 @@ -LABEL arch64_nbd -TEXT HELP -Boot the Arch Linux install medium using NBD. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, NBD) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y -SYSAPPEND 3 - -LABEL arch64_nfs -TEXT HELP -Boot the Arch Linux live medium using NFS. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, NFS) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y -SYSAPPEND 3 - -LABEL arch64_http -TEXT HELP -Boot the Arch Linux live medium using HTTP. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, HTTP) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y -SYSAPPEND 3 diff --git a/syslinux/archiso_pxe.cfg b/syslinux/archiso_pxe.cfg deleted file mode 100644 index b4c9a80..0000000 --- a/syslinux/archiso_pxe.cfg +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDE archiso_head.cfg - -INCLUDE archiso_pxe-linux.cfg - -INCLUDE archiso_tail.cfg diff --git a/syslinux/archiso_sys-linux.cfg b/syslinux/archiso_sys-linux.cfg deleted file mode 100644 index 919e158..0000000 --- a/syslinux/archiso_sys-linux.cfg +++ /dev/null @@ -1,20 +0,0 @@ -LABEL arch64 -TEXT HELP -Boot the Arch Linux install medium on BIOS. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% - -# Accessibility boot option -LABEL arch64speech -TEXT HELP -Boot the Arch Linux install medium on BIOS with speakup screen reader. -It allows you to install Arch Linux or perform system maintenance with speech feedback. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on diff --git a/syslinux/archiso_sys.cfg b/syslinux/archiso_sys.cfg deleted file mode 100644 index d93bcfe..0000000 --- a/syslinux/archiso_sys.cfg +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE archiso_head.cfg - -DEFAULT arch64 -TIMEOUT 150 - -INCLUDE archiso_sys-linux.cfg - -INCLUDE archiso_tail.cfg diff --git a/syslinux/archiso_tail.cfg b/syslinux/archiso_tail.cfg deleted file mode 100644 index e84897c..0000000 --- a/syslinux/archiso_tail.cfg +++ /dev/null @@ -1,35 +0,0 @@ -LABEL existing -TEXT HELP -Boot an existing operating system. -Press TAB to edit the disk and partition number to boot. -ENDTEXT -MENU LABEL Boot existing OS -COM32 chain.c32 -APPEND hd0 0 - -# https://www.memtest.org/ -LABEL memtest -MENU LABEL Run Memtest86+ (RAM test) -LINUX /boot/memtest86+/memtest - -# https://wiki.syslinux.org/wiki/index.php/Hdt_(Hardware_Detection_Tool) -LABEL hdt -MENU LABEL Hardware Information (HDT) -COM32 hdt.c32 -APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz - -LABEL reboot -TEXT HELP -Reboot computer. -The computer's firmware must support APM. -ENDTEXT -MENU LABEL Reboot -COM32 reboot.c32 - -LABEL poweroff -TEXT HELP -Power off computer. -The computer's firmware must support APM. -ENDTEXT -MENU LABEL Power Off -COM32 poweroff.c32 diff --git a/syslinux/splash.png b/syslinux/splash.png deleted file mode 100644 index 64b959a..0000000 Binary files a/syslinux/splash.png and /dev/null differ diff --git a/syslinux/syslinux.cfg b/syslinux/syslinux.cfg deleted file mode 100644 index cbda72f..0000000 --- a/syslinux/syslinux.cfg +++ /dev/null @@ -1,11 +0,0 @@ -DEFAULT select - -LABEL select -COM32 whichsys.c32 -APPEND -pxe- pxe -sys- sys -iso- sys - -LABEL pxe -CONFIG archiso_pxe.cfg - -LABEL sys -CONFIG archiso_sys.cfg