Skip to content

Commit

Permalink
Add hw accel boot option; Use RT kernel
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Apr 20, 2021
1 parent 2590311 commit 0e2cf95
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
3 changes: 2 additions & 1 deletion archiso/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
15 changes: 11 additions & 4 deletions archiso/liveusb/efiboot/loader/entries/archiso-x86_64-linux.conf
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion archiso/liveusb/packages.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ efibootmgr
intel-ucode
kate
konsole
linux
linux-firmware
linux-rt
memtest86+
mkinitcpio
mkinitcpio-archiso
Expand Down
3 changes: 3 additions & 0 deletions archiso/liveusb/pacman.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
5 changes: 3 additions & 2 deletions archiso/liveusb/profiledef.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# shellcheck disable=SC2034

iso_name="mod-live-usb"
iso_label="v3"
iso_label="v4"
iso_publisher="MOD Devices <https://moddevices.com>"
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"
Expand All @@ -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"
)
12 changes: 9 additions & 3 deletions archiso/liveusb/syslinux/syslinux-linux.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 14 additions & 0 deletions live-welcome/mod-live-usb-welcome.run
Original file line number Diff line number Diff line change
@@ -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
14 changes: 11 additions & 3 deletions live-welcome/welcome.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 0e2cf95

Please sign in to comment.