From 4f94ad8ca93fa211a3b76286bc870ed3de1db4cf Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Thu, 30 May 2024 21:10:03 +0200 Subject: [PATCH] rework iso w. mkalpineiso, update base to 3.20 --- README.md | 8 ++++---- airootfs/etc/apk/repositories | 5 ++--- airootfs/root/install.sh | 10 +++++----- grub.cfg | 6 ------ customize-airootfs.sh => novos-base.sh | 6 ++---- profile.yaml | 17 ----------------- profiledef.sh | 17 +++++++++++++++++ 7 files changed, 30 insertions(+), 39 deletions(-) delete mode 100755 grub.cfg rename customize-airootfs.sh => novos-base.sh (82%) delete mode 100755 profile.yaml create mode 100644 profiledef.sh diff --git a/README.md b/README.md index 1c5f3ec..cce2866 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# NoveriaOS files +# Novos files -This are the official NoveriaOS files. -The ISO is generated using teaiso. +This are the official Novos files. +The ISO is generated using mkalpineiso. -Within the ISO, you'll be greeted by a installation-script to guide you through the installation-process of NoveriaOS. +Within the ISO, you'll be greeted by an installation-script to guide you through the installation-process of Novos. diff --git a/airootfs/etc/apk/repositories b/airootfs/etc/apk/repositories index 637b480..91b969a 100644 --- a/airootfs/etc/apk/repositories +++ b/airootfs/etc/apk/repositories @@ -1,3 +1,2 @@ -https://dl-cdn.alpinelinux.org/alpine/v3.19/main -https://dl-cdn.alpinelinux.org/alpine/v3.19/community -@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing +https://dl-cdn.alpinelinux.org/alpine/v3.20/main +https://dl-cdn.alpinelinux.org/alpine/v3.20/community diff --git a/airootfs/root/install.sh b/airootfs/root/install.sh index 858ef61..5aee735 100644 --- a/airootfs/root/install.sh +++ b/airootfs/root/install.sh @@ -2,7 +2,7 @@ ### ## -## NoveriaOS Install script +## Novos Install script ## ### @@ -23,9 +23,9 @@ readonly INSTALLATION_MOUNTPOINT='/mnt' readonly INSTALLATION_NOVERIA_BIN='/usr/local/noveria/bin' readonly INSTALLATION_SECRETS_FILE="/root/installation.secrets" readonly INSTALLATION_SALT_ROOT="srv/salt" -readonly INSTALLATION_SALT_GIT="https://git.noveria.org/NoveriaOS/salt-statetree.git" +readonly INSTALLATION_SALT_GIT="https://git.noveria.org/Novos/salt-statetree.git" readonly INSTALLATION_PILLAR_ROOT="srv/pillar" -readonly INSTALLATION_PILLAR_GIT="https://git.noveria.org/NoveriaOS/salt-pillartree.git" +readonly INSTALLATION_PILLAR_GIT="https://git.noveria.org/Novos/salt-pillartree.git" readonly INSTALLATION_ALPINE_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d= -f2) # Colors @@ -113,7 +113,7 @@ function preChecks() { 0) clear COUNTER=5 - echo "NoveriaOS is shutting down in: " + echo "Novos is shutting down in: " while [ 1 ]; do if [ ${COUNTER} -eq 0 ]; then break @@ -154,7 +154,7 @@ function introDialogue() { | |\ | (_) \ V / __/ | | | (_| | |_| \_|\___/ \_/ \___|_| |_|\__,_| - OS: NoveriaOS + OS: Novos Version: $(date "+%Y%m") IP: $(ifconfig eth0 | grep "inet addr" | awk '{$1=$1};1' | awk '{print $2}' | cut -d: -f2) diff --git a/grub.cfg b/grub.cfg deleted file mode 100755 index e3ebf45..0000000 --- a/grub.cfg +++ /dev/null @@ -1,6 +0,0 @@ -insmod all_video -insmod part_msdos -insmod part_gpt -insmod fat - -set timeout=1 diff --git a/customize-airootfs.sh b/novos-base.sh similarity index 82% rename from customize-airootfs.sh rename to novos-base.sh index e0bcde9..d65cd7e 100755 --- a/customize-airootfs.sh +++ b/novos-base.sh @@ -1,7 +1,7 @@ #!/usr/bin/env ash # overwrite default-hostname -echo "noveriaos-live" > /etc/hostname +echo "novos-live" > /etc/hostname hostname -F /etc/hostname # Enable networking on boot @@ -10,8 +10,6 @@ rc-update add networking # Enable hostname service rc-update add hostname -rc-update add sshd - # Set Swiss keymap setup-keymap ch ch @@ -20,7 +18,7 @@ setup-timezone Europe/Zurich hwclock --systohc # Change default shell of root from ash => zsh -sed -i 's~root:/bin/ash~root:/bin/zsh~' /etc/passwd +sed -i 's~root:/bin/sh~root:/bin/zsh~' /etc/passwd sed -i 's~/sbin/getty 38400~/sbin/mingetty --autologin root --noclear~' /etc/inittab diff --git a/profile.yaml b/profile.yaml deleted file mode 100755 index e787f71..0000000 --- a/profile.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: noveriaos -distro: alpine -publisher: Noveria Network -label: NOVERIAOS -codename: latest-stable -application_id: Alpine Linux Live Media -airootfs_directory: airootfs -#iso_merge: iso_merge -compression: squashfs||-comp gzip -grub_cfg: grub.cfg -packages: - - packages.x86_64 -file_permissions: - - /etc/shadow|0:0:400 - - /root/install.sh|0:0:755 -customize_airootfs: - - customize-airootfs.sh diff --git a/profiledef.sh b/profiledef.sh new file mode 100644 index 0000000..fd7c2e4 --- /dev/null +++ b/profiledef.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# shellcheck disable=SC2034 + +iso_name="novos" +iso_label="NOVOS_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d)" +iso_publisher="Noveria Network " +iso_application="Alpine-Linux Based Server OS for Noveria" +iso_version="v3.20" +airootfs_image_type="squashfs" +airootfs_image_tool_options="-comp gzip" +declare -gA file_permissions=( + ["/etc/shadow"]="0:0:400" + ["/root/install.sh"]="0:0:755" +) +customize_airootfs=( + "novos-base.sh" +)