Skip to content

Commit 0e2cf95

Browse files
committed
Add hw accel boot option; Use RT kernel
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 2590311 commit 0e2cf95

File tree

10 files changed

+57
-17
lines changed

10 files changed

+57
-17
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
TARGETS = archiso/output/mod-live-usb-v3-x86_64.iso
2+
TARGETS = archiso/output/mod-live-usb-v4-x86_64.iso
33

44
all: $(TARGETS)
55

archiso/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ docker run \
4343
-v ${PWD}/../live-welcome:/opt/mount/live-welcome \
4444
--rm mod-live-usb_iso:latest \
4545
/usr/bin/make -C /opt/mount/live-welcome
46-
cp ${PWD}/../live-welcome/mod-live-usb-welcome ${MOD_LIVE_DIR}/mod-live-usb-welcome
46+
cp ${PWD}/../live-welcome/mod-live-usb-welcome ${MOD_LIVE_DIR}/mod-live-usb-welcome
47+
cp ${PWD}/../live-welcome/mod-live-usb-welcome.run ${MOD_LIVE_DIR}/mod-live-usb-welcome.run
4748

4849
# delete pre-generated script
4950
rm -f ${MOD_LIVE_DIR}/config/soundcard.sh

archiso/liveusb/airootfs/etc/systemd/system/mod-live-welcome.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

44
[Unit]
5-
Description=MOD Live Welcome
5+
Description=MOD Live-USB Welcome
66
After=livecd-alsa-unmuter.service
77

88
[Service]
99
Type=simple
1010
Environment=USING_SYSTEMD=1
11-
ExecStart=/root/.mod-live/mod-live-usb-welcome -platform linuxfb -style Breeze --no-sandbox
11+
ExecStart=/root/.mod-live/mod-live-usb-welcome.run
1212
Restart=always
1313
WorkingDirectory=/root/
1414

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
#
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

4-
title Arch Linux (x86_64, UEFI)
5-
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
4+
title MOD Live-USB (x86_64, UEFI)
5+
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-rt
66
initrd /%INSTALL_DIR%/boot/intel-ucode.img
77
initrd /%INSTALL_DIR%/boot/amd-ucode.img
8-
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
9-
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
8+
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-rt.img
9+
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=linuxfb
10+
11+
title MOD Live-USB (x86_64, UEFI, HW accel)
12+
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-rt
13+
initrd /%INSTALL_DIR%/boot/intel-ucode.img
14+
initrd /%INSTALL_DIR%/boot/amd-ucode.img
15+
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-rt.img
16+
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=eglfs

archiso/liveusb/packages.x86_64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ efibootmgr
1212
intel-ucode
1313
kate
1414
konsole
15-
linux
1615
linux-firmware
16+
linux-rt
1717
memtest86+
1818
mkinitcpio
1919
mkinitcpio-archiso

archiso/liveusb/pacman.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ Include = /etc/pacman.d/mirrorlist
8686
[community]
8787
Include = /etc/pacman.d/mirrorlist
8888

89+
[realtime]
90+
Server = https://pkgbuild.com/~dvzrv/repos/realtime/$arch
91+
8992
# If you want to run 32 bit applications on your x86_64 system,
9093
# enable the multilib repositories as required here.
9194

archiso/liveusb/profiledef.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# shellcheck disable=SC2034
33

44
iso_name="mod-live-usb"
5-
iso_label="v3"
5+
iso_label="v4"
66
iso_publisher="MOD Devices <https://moddevices.com>"
77
iso_application="MOD Live USB"
8-
iso_version="v3"
8+
iso_version="v4"
99
install_dir="arch"
1010
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
1111
arch="x86_64"
@@ -16,6 +16,7 @@ file_permissions=(
1616
["/etc/shadow"]="0:0:400"
1717
["/root"]="0:0:750"
1818
["/root/.mod-live/mod-live-usb-welcome"]="0:0:755"
19+
["/root/.mod-live/mod-live-usb-welcome.run"]="0:0:755"
1920
["/root/.mod-live/start.sh"]="0:0:755"
2021
["/usr/local/bin/livecd-sound"]="0:0:755"
2122
)

archiso/liveusb/syslinux/syslinux-linux.cfg

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
LABEL arch
55
MENU LABEL MOD Live-USB (x86_64, BIOS)
6-
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
7-
INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
8-
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% threadirqs
6+
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-rt
7+
INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-rt.img
8+
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=linuxfb
9+
10+
LABEL arch
11+
MENU LABEL MOD Live-USB (x86_64, BIOS, HW accel)
12+
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-rt
13+
INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-rt.img
14+
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% consoleblank=0 platform=eglfs
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/sh
2+
3+
if [ -z "${USING_SYSTEMD}" ]; then
4+
exit 0
5+
fi
6+
7+
if grep -q platform=eglfs /proc/cmdline; then
8+
PLATFORM=eglfs
9+
else
10+
PLATFORM=linuxfb
11+
fi
12+
13+
SELF=$(echo ${0} | sed "s/.run//")
14+
exec ${SELF} -platform ${PLATFORM} -style Breeze --no-sandbox

live-welcome/welcome.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ int main(int argc, char* argv[])
99
{
1010
QApplication app(argc, argv);
1111
// app.setApplicationDisplayName("MOD Live USB Welcome");
12-
app.setApplicationName("MOD Live USB Welcome");
12+
app.setApplicationName("MOD Live-USB Welcome");
1313

1414
QFont font(app.font());
1515
font.setPixelSize(16);
@@ -78,8 +78,16 @@ int main(int argc, char* argv[])
7878
#endif
7979

8080
KioskWindow win;
81-
win.resize(1200, 800);
82-
win.show();
81+
82+
if (getenv("USING_SYSTEMD") != nullptr)
83+
{
84+
win.showFullScreen();
85+
}
86+
else
87+
{
88+
win.resize(1200, 800);
89+
win.show();
90+
}
8391

8492
if (getenv("TESTING") == nullptr)
8593
win.openSettings(false);

0 commit comments

Comments
 (0)