From 5992dcb5324095adbf1331561a97c2d0202b4034 Mon Sep 17 00:00:00 2001 From: simono41 Date: Sun, 1 Apr 2018 15:39:54 +0200 Subject: [PATCH] plymouth --- arch-graphical-install-auto | 1 + arch-install | 24 ++++++++++++------- make_mksquashfs-auto.sh | 3 ++- releng/all/archiso-x86_64-cd-cinnamon.conf | 2 +- releng/all/archiso-x86_64-cd-gnome.conf | 2 +- releng/all/archiso-x86_64-cd-kde.conf | 2 +- releng/all/archiso-x86_64-cd-lxde.conf | 2 +- releng/all/archiso-x86_64-cd-lxqt.conf | 2 +- releng/all/archiso-x86_64-cd-mate.conf | 2 +- releng/all/archiso-x86_64-cd-xfce4.conf | 2 +- releng/all/archiso-x86_64-usb-cinnamon.conf | 2 +- releng/all/archiso-x86_64-usb-gnome.conf | 2 +- releng/all/archiso-x86_64-usb-kde.conf | 2 +- releng/all/archiso-x86_64-usb-lxde.conf | 2 +- releng/all/archiso-x86_64-usb-lxqt.conf | 2 +- releng/all/archiso-x86_64-usb-mate.conf | 2 +- releng/all/archiso-x86_64-usb-xfce4.conf | 2 +- .../archiso-x86_64-cd-default-checksum.conf | 2 +- releng/archiso-x86_64-cd-default-nvidia.conf | 2 +- releng/archiso-x86_64-cd-default.conf | 2 +- ...chiso-x86_64-cd-default_noimage-toram.conf | 2 +- releng/archiso-x86_64-cd-default_noimage.conf | 2 +- releng/archiso-x86_64-cd-default_toram.conf | 2 +- .../archiso-x86_64-usb-default-checksum.conf | 2 +- releng/archiso-x86_64-usb-default-nvidia.conf | 2 +- releng/archiso-x86_64-usb-default.conf | 2 +- ...hiso-x86_64-usb-default_noimage-toram.conf | 2 +- .../archiso-x86_64-usb-default_noimage.conf | 2 +- releng/archiso-x86_64-usb-default_toram.conf | 2 +- syslinux-noimage.cfg | 2 +- syslinux-standart.cfg | 12 +++++----- syslinux.cfg | 24 +++++++++---------- 32 files changed, 63 insertions(+), 55 deletions(-) diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto index 63b24ed..f11e3b2 100755 --- a/arch-graphical-install-auto +++ b/arch-graphical-install-auto @@ -358,6 +358,7 @@ if [ "${version}" != "libre" ]; then aurmanagerinstall aurinstall pamac-aur aurinstall google-chrome + aurinstall plymouth fi diff --git a/arch-install b/arch-install index eb5e4af..ebb381d 100755 --- a/arch-install +++ b/arch-install @@ -262,10 +262,16 @@ function installation { parameter="${parameter}btrfs " fi fi + if [ "${usbsecret}" == "y" ]; then parameter="${parameter}usbsecret " fi + if [ "${version}" != "libre" ]; then + parameter="${parameter}plymouth " + fi + + echo "" if [ "${version}" == "libre" ]; then echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf @@ -351,15 +357,15 @@ function installation { if [ "${swap}" != "n" ]; then swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer}) if [ "${usbkey}" == "y" ]; then - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition' cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition' cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey nvidia-drm.modeset=1 quiet splash"/' ${mountpoint}/etc/default/grub else - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition' nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition' nvidia-drm.modeset=1 quiet splash"/' ${mountpoint}/etc/default/grub fi else if [ "${usbkey}" == "y" ]; then - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey nvidia-drm.modeset=1 quiet splash"/' ${mountpoint}/etc/default/grub else - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 nvidia-drm.modeset=1 quiet splash"/' ${mountpoint}/etc/default/grub fi fi echo "GRUB_ENABLE_CRYPTODISK=y" >> ${mountpoint}/etc/default/grub @@ -369,7 +375,7 @@ function installation { tobootdevice=$(blkid -s PARTUUID -o value ${device}${rootpartitionnummer}) if [ "${swap}" != "n" ]; then swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer}) - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="resume=PARTUUID='$swappartition' nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="resume=PARTUUID='$swappartition' nvidia-drm.modeset=1 quiet splash"/' ${mountpoint}/etc/default/grub fi fi fi @@ -604,13 +610,13 @@ function systemdboot() { echo "linux /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "initrd /initramfs-linux.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf - echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf + echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "title "${repo}"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "linux /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "initrd /initramfs-linux-fallback.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf - echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf + echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "default arch-uefi" > ${mountpoint}/boot/loader/loader.conf echo "timeout 1" >> ${mountpoint}/boot/loader/loader.conf @@ -621,10 +627,10 @@ function systemdboot() { arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l /EFI/systemd/systemd-bootx64.efi -L "Linux Boot Manager" - arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux efistub" -u "initrd=/initramfs-linux.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1" + arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux efistub" -u "initrd=/initramfs-linux.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" # überschreibt die efistub deswegen entfernt - #arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux fallback efistub" -u "initrd=/initramfs-linux-fallback.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1" + #arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux fallback efistub" -u "initrd=/initramfs-linux-fallback.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" #arch-chroot ${mountpoint} bootctl install diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh index cc8c260..3de463f 100755 --- a/make_mksquashfs-auto.sh +++ b/make_mksquashfs-auto.sh @@ -95,10 +95,11 @@ function filesystem() { # module and hooks if [ "${version}" == "libre" ]; then echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf + echo "HOOKS=\"base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard cow_device\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf else echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf + echo "HOOKS=\"base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard cow_device\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf fi - echo "HOOKS=\"base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard cow_device\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf diff --git a/releng/all/archiso-x86_64-cd-cinnamon.conf b/releng/all/archiso-x86_64-cd-cinnamon.conf index fe14b7c..94af7f7 100755 --- a/releng/all/archiso-x86_64-cd-cinnamon.conf +++ b/releng/all/archiso-x86_64-cd-cinnamon.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT CINNAMON linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon quiet splash diff --git a/releng/all/archiso-x86_64-cd-gnome.conf b/releng/all/archiso-x86_64-cd-gnome.conf index 64ce5d8..1431bfa 100755 --- a/releng/all/archiso-x86_64-cd-gnome.conf +++ b/releng/all/archiso-x86_64-cd-gnome.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT GNOME linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome quiet splash diff --git a/releng/all/archiso-x86_64-cd-kde.conf b/releng/all/archiso-x86_64-cd-kde.conf index 6456a61..d30beba 100755 --- a/releng/all/archiso-x86_64-cd-kde.conf +++ b/releng/all/archiso-x86_64-cd-kde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT KDE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde quiet splash diff --git a/releng/all/archiso-x86_64-cd-lxde.conf b/releng/all/archiso-x86_64-cd-lxde.conf index 3ca126e..1ed4080 100755 --- a/releng/all/archiso-x86_64-cd-lxde.conf +++ b/releng/all/archiso-x86_64-cd-lxde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT LXDE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde quiet splash diff --git a/releng/all/archiso-x86_64-cd-lxqt.conf b/releng/all/archiso-x86_64-cd-lxqt.conf index c600e18..9bcd325 100755 --- a/releng/all/archiso-x86_64-cd-lxqt.conf +++ b/releng/all/archiso-x86_64-cd-lxqt.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT LXQT linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt quiet splash diff --git a/releng/all/archiso-x86_64-cd-mate.conf b/releng/all/archiso-x86_64-cd-mate.conf index 1f887c2..bf7ddd3 100755 --- a/releng/all/archiso-x86_64-cd-mate.conf +++ b/releng/all/archiso-x86_64-cd-mate.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT MATE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate quiet splash diff --git a/releng/all/archiso-x86_64-cd-xfce4.conf b/releng/all/archiso-x86_64-cd-xfce4.conf index 384a294..85a6582 100755 --- a/releng/all/archiso-x86_64-cd-xfce4.conf +++ b/releng/all/archiso-x86_64-cd-xfce4.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT XFCE4 linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 quiet splash diff --git a/releng/all/archiso-x86_64-usb-cinnamon.conf b/releng/all/archiso-x86_64-usb-cinnamon.conf index beedce8..7f62421 100755 --- a/releng/all/archiso-x86_64-usb-cinnamon.conf +++ b/releng/all/archiso-x86_64-usb-cinnamon.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT CINNAMON linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon quiet splash diff --git a/releng/all/archiso-x86_64-usb-gnome.conf b/releng/all/archiso-x86_64-usb-gnome.conf index ced191c..69a9363 100755 --- a/releng/all/archiso-x86_64-usb-gnome.conf +++ b/releng/all/archiso-x86_64-usb-gnome.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT GNOME linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome quiet splash diff --git a/releng/all/archiso-x86_64-usb-kde.conf b/releng/all/archiso-x86_64-usb-kde.conf index 78b3cd2..b041911 100755 --- a/releng/all/archiso-x86_64-usb-kde.conf +++ b/releng/all/archiso-x86_64-usb-kde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT KDE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde quiet splash diff --git a/releng/all/archiso-x86_64-usb-lxde.conf b/releng/all/archiso-x86_64-usb-lxde.conf index cba2729..927d6bc 100755 --- a/releng/all/archiso-x86_64-usb-lxde.conf +++ b/releng/all/archiso-x86_64-usb-lxde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT LXDE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde quiet splash diff --git a/releng/all/archiso-x86_64-usb-lxqt.conf b/releng/all/archiso-x86_64-usb-lxqt.conf index 8280020..b433d32 100755 --- a/releng/all/archiso-x86_64-usb-lxqt.conf +++ b/releng/all/archiso-x86_64-usb-lxqt.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT LXQT linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt quiet splash diff --git a/releng/all/archiso-x86_64-usb-mate.conf b/releng/all/archiso-x86_64-usb-mate.conf index 01a9cf0..bb6be51 100755 --- a/releng/all/archiso-x86_64-usb-mate.conf +++ b/releng/all/archiso-x86_64-usb-mate.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT MATE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate quiet splash diff --git a/releng/all/archiso-x86_64-usb-xfce4.conf b/releng/all/archiso-x86_64-usb-xfce4.conf index ae86a76..0039801 100755 --- a/releng/all/archiso-x86_64-usb-xfce4.conf +++ b/releng/all/archiso-x86_64-usb-xfce4.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT XFCE4 linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 quiet splash diff --git a/releng/archiso-x86_64-cd-default-checksum.conf b/releng/archiso-x86_64-cd-default-checksum.conf index b945980..18275a9 100755 --- a/releng/archiso-x86_64-cd-default-checksum.conf +++ b/releng/archiso-x86_64-cd-default-checksum.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT Check disc for defects linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash diff --git a/releng/archiso-x86_64-cd-default-nvidia.conf b/releng/archiso-x86_64-cd-default-nvidia.conf index 5e326a8..12143bd 100755 --- a/releng/archiso-x86_64-cd-default-nvidia.conf +++ b/releng/archiso-x86_64-cd-default-nvidia.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT NVIDIA linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y quiet splash diff --git a/releng/archiso-x86_64-cd-default.conf b/releng/archiso-x86_64-cd-default.conf index 3a7f917..217557f 100755 --- a/releng/archiso-x86_64-cd-default.conf +++ b/releng/archiso-x86_64-cd-default.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash diff --git a/releng/archiso-x86_64-cd-default_noimage-toram.conf b/releng/archiso-x86_64-cd-default_noimage-toram.conf index 2a5ebe2..95f20fa 100755 --- a/releng/archiso-x86_64-cd-default_noimage-toram.conf +++ b/releng/archiso-x86_64-cd-default_noimage-toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT NOIMAGE TORAM linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash diff --git a/releng/archiso-x86_64-cd-default_noimage.conf b/releng/archiso-x86_64-cd-default_noimage.conf index 57c7ef0..07312cb 100755 --- a/releng/archiso-x86_64-cd-default_noimage.conf +++ b/releng/archiso-x86_64-cd-default_noimage.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT NOIMAGE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash diff --git a/releng/archiso-x86_64-cd-default_toram.conf b/releng/archiso-x86_64-cd-default_toram.conf index 5ddc246..218b99e 100755 --- a/releng/archiso-x86_64-cd-default_toram.conf +++ b/releng/archiso-x86_64-cd-default_toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT TORAM linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash diff --git a/releng/archiso-x86_64-usb-default-checksum.conf b/releng/archiso-x86_64-usb-default-checksum.conf index b4aa86c..f372375 100755 --- a/releng/archiso-x86_64-usb-default-checksum.conf +++ b/releng/archiso-x86_64-usb-default-checksum.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT Check disc for defects linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash diff --git a/releng/archiso-x86_64-usb-default-nvidia.conf b/releng/archiso-x86_64-usb-default-nvidia.conf index e2df8a6..71d5472 100755 --- a/releng/archiso-x86_64-usb-default-nvidia.conf +++ b/releng/archiso-x86_64-usb-default-nvidia.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT NVIDIA linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y quiet splash diff --git a/releng/archiso-x86_64-usb-default.conf b/releng/archiso-x86_64-usb-default.conf index 1494d5a..f34d854 100755 --- a/releng/archiso-x86_64-usb-default.conf +++ b/releng/archiso-x86_64-usb-default.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash diff --git a/releng/archiso-x86_64-usb-default_noimage-toram.conf b/releng/archiso-x86_64-usb-default_noimage-toram.conf index 1f231ee..ef64d16 100755 --- a/releng/archiso-x86_64-usb-default_noimage-toram.conf +++ b/releng/archiso-x86_64-usb-default_noimage-toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT NOIMAGE TORAM linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash diff --git a/releng/archiso-x86_64-usb-default_noimage.conf b/releng/archiso-x86_64-usb-default_noimage.conf index 6052b12..f724253 100755 --- a/releng/archiso-x86_64-usb-default_noimage.conf +++ b/releng/archiso-x86_64-usb-default_noimage.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT NOIMAGE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash diff --git a/releng/archiso-x86_64-usb-default_toram.conf b/releng/archiso-x86_64-usb-default_toram.conf index 72176d7..66454bb 100755 --- a/releng/archiso-x86_64-usb-default_toram.conf +++ b/releng/archiso-x86_64-usb-default_toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT TORAM linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash diff --git a/syslinux-noimage.cfg b/syslinux-noimage.cfg index fbbd3ee..1988de6 100755 --- a/syslinux-noimage.cfg +++ b/syslinux-noimage.cfg @@ -3,4 +3,4 @@ LABEL arch MENU LABEL SPECTRE_OS DEFAULT NOIMAGE LINUX /arch/boot/x86_64/vmlinuz INITRD /arch/boot/x86_64/archiso.img -APPEND archisolabel=SPECTRE_OS cow_label=cow_device +APPEND archisolabel=SPECTRE_OS cow_label=cow_device quiet splash diff --git a/syslinux-standart.cfg b/syslinux-standart.cfg index cb62535..6e33be8 100755 --- a/syslinux-standart.cfg +++ b/syslinux-standart.cfg @@ -3,40 +3,40 @@ LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash # default toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M +APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash # default noimage LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash # default noimage toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash # default nvidia LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NVIDIA LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y quiet splash # default checksum LABEL arch MENU LABEL %ISO_LABEL% DEFAULT Check disc for defects LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash diff --git a/syslinux.cfg b/syslinux.cfg index be8b22c..33cdebf 100755 --- a/syslinux.cfg +++ b/syslinux.cfg @@ -3,82 +3,82 @@ LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash # default Gnome LABEL arch MENU LABEL %ISO_LABEL% DEFAULT GNOME LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome quiet splash # default cinnamon LABEL arch MENU LABEL %ISO_LABEL% DEFAULT CINNAMON LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon quiet splash # default mate LABEL arch MENU LABEL %ISO_LABEL% DEFAULT MATE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate quiet splash # default lxde LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LXDE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde quiet splash # default lxqt LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LXQT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt quiet splash # default xfce4 LABEL arch MENU LABEL %ISO_LABEL% DEFAULT XFCE4 LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 quiet splash # default kde LABEL arch MENU LABEL %ISO_LABEL% DEFAULT KDE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde quiet splash # default toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M +APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash # default noimage LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash # default noimage toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash # default checksum LABEL arch MENU LABEL %ISO_LABEL% DEFAULT Check disc for defects LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash