update build-server-image-chroot.sh build-server-image-eos.sh eos-ARM-server-config.sh ADD lsb-release os-release server-addons

Author: pudges-place

build-server-image-chroot.sh

@@ -75,8 +75,8 @@ _finish_up() {
     printf "alias lb='lsblk -o NAME,FSTYPE,FSSIZE,LABEL,MOUNTPOINT'\n\n" >> /etc/bash.bashrc
 
     sed -i 's|# Server = http://mirror.archlinuxarm.org/$arch/$repo| Server = http://mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
+    sed -i 's| Server = http://ca.us.mirror.archlinuxarm.org/$arch/$repo|# Server = http://ca.us.mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
     sed -i 's| Server = http://fl.us.mirror.archlinuxarm.org/$arch/$repo|# Server = http://fl.us.mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
-    sed -i 's| Server = http://il.us.mirror.archlinuxarm.org/$arch/$repo|# Server = http://il.us.mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
 
     rm /var/cache/pacman/pkg/*
     rm /root/build-server-image-chroot.sh
@@ -85,8 +85,14 @@ _finish_up() {
     rm /home/alarm/smb.conf
     rm /home/alarm/server-addons
     cp /home/alarm/config-server.service /etc/systemd/system/
+    cp /home/alarm/lsb-release /etc/
+    cp /home/alarm/os-release /etc/
+    sed -i 's/Arch/EndeavourOS/g' /etc/issue
+    sed -i 's/Arch/EndeavourOS/g' /usr/share/factory/etc/issue
     systemctl enable config-server.service
+    systemctl enable NetworkManager
     rm /home/alarm/config-server.service
+
     printf "\n\n${CYAN}Your uSD is ready for creating an image.${NC}\n"
 }   # end of function _finish_up
 
@@ -117,18 +123,23 @@ Main() {
    pacman-key --populate archlinuxarm
    pacman -Syy
    pacman -S --noconfirm wget
-#   _find_mirrorlist
-#   _find_keyring
+
    sed -i 's| Server = http://mirror.archlinuxarm.org/$arch/$repo|# Server = http://mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
+   sed -i 's|# Server = http://ca.us.mirror.archlinuxarm.org/$arch/$repo| Server = http://ca.us.mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
    sed -i 's|# Server = http://fl.us.mirror.archlinuxarm.org/$arch/$repo| Server = http://fl.us.mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
-   sed -i 's|# Server = http://il.us.mirror.archlinuxarm.org/$arch/$repo| Server = http://il.us.mirror.archlinuxarm.org/$arch/$repo|g' /etc/pacman.d/mirrorlist
    pacman -Syy
 
-
    case $PLATFORM_NAME in
-     OdroidN2) pacman -R --noconfirm linux-odroid-n2 uboot-odroid-n2
-               pacman -Syu --noconfirm --needed linux-odroid linux-odroid-headers uboot-odroid-n2plus  odroid-n2-post-install
-               # cp /home/alarm/n2-boot.ini /boot/boot.ini
+     OdroidN2) _find_mirrorlist
+               _find_keyring
+               pacman -Syy
+               pacman -R --noconfirm linux-odroid-n2 uboot-odroid-n2
+               pacman -Syu --noconfirm --needed linux-odroid linux-odroid-headers uboot-odroid-n2plus
+               cp /home/alarm/n2-boot.ini /boot/boot.ini
+               pacman -R --noconfrm endeavouros-mirrorlist endeavouros-keyring
+               sed -i '/endeavouros/d' /etc/pacman.conf
+               sed -i '/SigLevel = PackageRequired/d' /etc/pacman.conf
+               rm /etc/pacman.d/endeavouros-mirrorlist
                ;;
      RPi64)    pacman -R --noconfirm linux-aarch64 uboot-raspberrypi
                pacman -Syu --noconfirm --needed linux-rpi raspberrypi-bootloader raspberrypi-firmware

build-server-image-eos.sh

@@ -24,6 +24,8 @@ _copy_stuff_for_chroot() {
     cp smb.conf /mnt/home/alarm
     cp server-addons /mnt/home/alarm
     cp config-server.service /mnt/home/alarm/
+    cp lsb-release /mnt/home/alarm
+    cp os-release /mnt/home/alarm
     case $PLATFORM in
       RPi64)    cp rpi4-config.txt /mnt/home/alarm/ ;;
       OdroidN2) cp n2-boot.ini /mnt/home/alarm ;;
@@ -256,7 +258,7 @@ Main() {
     CYAN='\033[0;36m'
     NC='\033[0m' # No Color
 
-    pacman -S --noconfirm --needed libnewt arch-install-scripts time &>/dev/null # for whiplash dialog
+    pacman -S --noconfirm --needed libnewt arch-install-scripts time sed &>/dev/null # for whiplash dialog
     _check_if_root
     _read_options "$@"
 

eos-ARM-server-config.sh

@@ -387,7 +387,7 @@ _precheck_setup() {
        if [ "$device" == "" ]; then
           printf "\n${CYAN}Network is down${NC}\n"
        else
-          state=$(ip link show | grep $device | awk '{print $9}')
+          state=$(ip link show | grep "$device" | awk '{print $9}')
           if [ "$state" == "UP" ]; then
           finished=0
           printf "\n${CYAN}Network $device is up${NC}\n\n"

lsb-release

@@ -0,0 +1,4 @@
+DISTRIB_ID="EndeavourOS ARM"
+DISTRIB_RELEASE="rolling"
+DISTRIB_DESCRIPTION="EndeavourOS Linux"
+DISTRIB_CODENAME=rolling

os-release

@@ -0,0 +1,11 @@
+NAME=EndeavourOS
+PRETTY_NAME=EndeavourOS
+ID=endeavouros
+ID_LIKE=arch
+BUILD_ID=rolling
+ANSI_COLOR="38;2;23;147;209"
+HOME_URL='https://arm.endeavouros.com'
+DOCUMENTATION_URL='https://discovery.endeavouros.com'
+SUPPORT_URL='https://forum.endeavouros.com'
+BUG_REPORT_URL='https://forum.endeavouros.com/c/arch-based-related-questions/bug-reports'
+LOGO=endeavouros

server-addons

@@ -30,4 +30,15 @@ parted
 bash-completion
 firewalld
 rsync
-wget
+dhclient
+dnsmasq
+dnsutils
+ethtool
+iwd
+networkmanager
+nss-mdns
+openssh
+usb_modeswitch
+neofetch
+vi
+nano