diff --git a/Makefile b/Makefile index 317f9b4..0239303 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -TARGETS = archiso/output/mod-live-usb-v3-x86_64.iso +TARGETS = archiso/output/mod-live-usb-v4-x86_64.iso all: $(TARGETS) diff --git a/archiso/build.sh b/archiso/build.sh index e89a8d5..0445037 100755 --- a/archiso/build.sh +++ b/archiso/build.sh @@ -43,7 +43,8 @@ docker run \ -v ${PWD}/../live-welcome:/opt/mount/live-welcome \ --rm mod-live-usb_iso:latest \ /usr/bin/make -C /opt/mount/live-welcome -cp ${PWD}/../live-welcome/mod-live-usb-welcome ${MOD_LIVE_DIR}/mod-live-usb-welcome +cp ${PWD}/../live-welcome/mod-live-usb-welcome ${MOD_LIVE_DIR}/mod-live-usb-welcome +cp ${PWD}/../live-welcome/mod-live-usb-welcome.run ${MOD_LIVE_DIR}/mod-live-usb-welcome.run # delete pre-generated script rm -f ${MOD_LIVE_DIR}/config/soundcard.sh diff --git a/archiso/liveusb/airootfs/etc/systemd/system/mod-live-welcome.service b/archiso/liveusb/airootfs/etc/systemd/system/mod-live-welcome.service index 861b4c5..e530b0c 100644 --- a/archiso/liveusb/airootfs/etc/systemd/system/mod-live-welcome.service +++ b/archiso/liveusb/airootfs/etc/systemd/system/mod-live-welcome.service @@ -2,13 +2,13 @@ # SPDX-License-Identifier: GPL-3.0-or-later [Unit] -Description=MOD Live Welcome +Description=MOD Live-USB Welcome After=livecd-alsa-unmuter.service [Service] Type=simple Environment=USING_SYSTEMD=1 -ExecStart=/root/.mod-live/mod-live-usb-welcome -platform linuxfb -style Breeze --no-sandbox +ExecStart=/root/.mod-live/mod-live-usb-welcome.run Restart=always WorkingDirectory=/root/ diff --git a/archiso/liveusb/efiboot/loader/entries/archiso-x86_64-linux.conf b/archiso/liveusb/efiboot/loader/entries/archiso-x86_64-linux.conf index f694199..ef9fa58 100644 --- a/archiso/liveusb/efiboot/loader/entries/archiso-x86_64-linux.conf +++ b/archiso/liveusb/efiboot/loader/entries/archiso-x86_64-linux.conf @@ -1,9 +1,16 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -title Arch Linux (x86_64, UEFI) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +title MOD Live-USB (x86_64, UEFI) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-rt initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-rt.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=linuxfb + +title MOD Live-USB (x86_64, UEFI, HW accel) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-rt +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-rt.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=eglfs diff --git a/archiso/liveusb/packages.x86_64 b/archiso/liveusb/packages.x86_64 index 869c877..d39f298 100644 --- a/archiso/liveusb/packages.x86_64 +++ b/archiso/liveusb/packages.x86_64 @@ -12,8 +12,8 @@ efibootmgr intel-ucode kate konsole -linux linux-firmware +linux-rt memtest86+ mkinitcpio mkinitcpio-archiso diff --git a/archiso/liveusb/pacman.conf b/archiso/liveusb/pacman.conf index 9d895e9..3f5d8df 100644 --- a/archiso/liveusb/pacman.conf +++ b/archiso/liveusb/pacman.conf @@ -86,6 +86,9 @@ Include = /etc/pacman.d/mirrorlist [community] Include = /etc/pacman.d/mirrorlist +[realtime] +Server = https://pkgbuild.com/~dvzrv/repos/realtime/$arch + # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. diff --git a/archiso/liveusb/profiledef.sh b/archiso/liveusb/profiledef.sh index 1013e4a..e43a147 100644 --- a/archiso/liveusb/profiledef.sh +++ b/archiso/liveusb/profiledef.sh @@ -2,10 +2,10 @@ # shellcheck disable=SC2034 iso_name="mod-live-usb" -iso_label="v3" +iso_label="v4" iso_publisher="MOD Devices " iso_application="MOD Live USB" -iso_version="v3" +iso_version="v4" install_dir="arch" bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" @@ -16,6 +16,7 @@ file_permissions=( ["/etc/shadow"]="0:0:400" ["/root"]="0:0:750" ["/root/.mod-live/mod-live-usb-welcome"]="0:0:755" + ["/root/.mod-live/mod-live-usb-welcome.run"]="0:0:755" ["/root/.mod-live/start.sh"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" ) diff --git a/archiso/liveusb/syslinux/syslinux-linux.cfg b/archiso/liveusb/syslinux/syslinux-linux.cfg index 695c1aa..af353c8 100644 --- a/archiso/liveusb/syslinux/syslinux-linux.cfg +++ b/archiso/liveusb/syslinux/syslinux-linux.cfg @@ -3,6 +3,12 @@ LABEL arch MENU LABEL MOD Live-USB (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% threadirqs +LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-rt +INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-rt.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=linuxfb + +LABEL arch +MENU LABEL MOD Live-USB (x86_64, BIOS, HW accel) +LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-rt +INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-rt.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=eglfs diff --git a/live-welcome/mod-live-usb-welcome.run b/live-welcome/mod-live-usb-welcome.run new file mode 100755 index 0000000..3511628 --- /dev/null +++ b/live-welcome/mod-live-usb-welcome.run @@ -0,0 +1,14 @@ +#!/usr/bin/sh + +if [ -z "${USING_SYSTEMD}" ]; then + exit 0 +fi + +if grep -q platform=eglfs /proc/cmdline; then + PLATFORM=eglfs +else + PLATFORM=linuxfb +fi + +SELF=$(echo ${0} | sed "s/.run//") +exec ${SELF} -platform ${PLATFORM} -style Breeze --no-sandbox diff --git a/live-welcome/welcome.cpp b/live-welcome/welcome.cpp index 4950ffe..64b79fd 100644 --- a/live-welcome/welcome.cpp +++ b/live-welcome/welcome.cpp @@ -9,7 +9,7 @@ int main(int argc, char* argv[]) { QApplication app(argc, argv); // app.setApplicationDisplayName("MOD Live USB Welcome"); - app.setApplicationName("MOD Live USB Welcome"); + app.setApplicationName("MOD Live-USB Welcome"); QFont font(app.font()); font.setPixelSize(16); @@ -78,8 +78,16 @@ int main(int argc, char* argv[]) #endif KioskWindow win; - win.resize(1200, 800); - win.show(); + + if (getenv("USING_SYSTEMD") != nullptr) + { + win.showFullScreen(); + } + else + { + win.resize(1200, 800); + win.show(); + } if (getenv("TESTING") == nullptr) win.openSettings(false);