diff --git a/01_prepare.sh b/01_prepare.sh index 0501591..2702ea3 100755 --- a/01_prepare.sh +++ b/01_prepare.sh @@ -3,6 +3,7 @@ sudo pacman -Sw --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168 sudo pacman -Sw --noconfirm --cachedir "./airootfs/usr/share/packages" dracut \ +eos-dracut \ grub \ kernel-install-for-dracut \ libxvmc \ diff --git a/04_boot.sh b/04_boot.sh old mode 100644 new mode 100755 index e07f0e6..7cabc6c --- a/04_boot.sh +++ b/04_boot.sh @@ -9,7 +9,7 @@ cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./out/" qemu-system-x86_64 \ -boot order=d,menu=on,reboot-timeout=5000 \ --cdrom ./out/$(ls -1 | grep "\.iso" | tail -n 1) \ +-cdrom ./out/$(ls -1 ./out/ | grep "\.iso" | tail -n 1) \ -drive file=melawy.img,index=0,media=disk,format=qcow2 \ -smbios type=0,uefi=on \ -smp cpus=$virt_cpu \ @@ -35,3 +35,5 @@ qemu-system-x86_64 \ # -display sdl,gl=on,show-cursor=on,window-close=on \ # -full-screen \ # -audiodev pa,id=snd0 \ +# -net nic,vlan=0 -net user,vlan=0 +# -net nic,vlan=0 -net user,vlan=0 -netdev user,id=user.0 -device e1000,netdev=user.0 diff --git a/airootfs/root/archives/liveuser.tar.xz b/airootfs/root/archives/liveuser.tar.xz index da8aec7..91e6a8b 100644 Binary files a/airootfs/root/archives/liveuser.tar.xz and b/airootfs/root/archives/liveuser.tar.xz differ diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh index 52038bc..767e400 100755 --- a/airootfs/root/customize_airootfs.sh +++ b/airootfs/root/customize_airootfs.sh @@ -30,16 +30,23 @@ echo -e "[Daemon]\nTheme=melawy-lera-sugar\nDeviceScale=1\nDeviceTimeout=8\nShow # cat "/usr/lib/melawy-linux-release" >> "/etc/motd" # echo "------------------" >> "/etc/motd" - +# Melawy mkdir -p "/etc/calamares/configs/melawy-linux/files/" cp "/root/wallpaper.png" "/etc/calamares/configs/melawy-linux/files/melawy-linux-wallpaper.png" chmod 644 "/etc/calamares/configs/melawy-linux/files/"*".png" - chmod 644 "/usr/share/wallpapers/melawy-linux-wallpapers/"*".png" cp "/usr/lib/modprobe.d/nvidia-utils.conf" "/etc/calamares/configs/melawy-linux/files/nv-modprobe" cp "/usr/lib/modules-load.d/nvidia-utils.conf" "/etc/calamares/configs/melawy-linux/files/nv-modules-load" +# EOS +cp "/root/wallpaper.png" "/etc/calamares/files/endeavouros-wallpaper.png" +chmod 644 "/etc/calamares/files/"*".png" + +mv "/usr/lib/modprobe.d/nvidia-utils.conf" "/etc/calamares/files/nv-modprobe" +mv "/usr/lib/modules-load.d/nvidia-utils.conf" "/etc/calamares/files/nv-modules-load" + + # systemctl enable sddm.service # systemctl enable ntpd.service # systemctl enable NetworkManager.service systemd-timesyncd.service bluetooth.service firewalld.service diff --git a/packages.x86_64 b/packages.x86_64 index 51af0ef..34210c9 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -271,7 +271,7 @@ welcome yay ## Calamares EndeavourOS -calamares +#calamares ckbcomp os-prober @@ -683,3 +683,4 @@ win11-icon-theme-white-git ## Calamares Melawy #melawy-calamares #melawy-calamares-configs +melawy-calamares-eos-git