diff --git a/configs/boot_grub_grub.cfg b/configs/boot_grub_grub.cfg index 31373d0..acaa9e4 100644 --- a/configs/boot_grub_grub.cfg +++ b/configs/boot_grub_grub.cfg @@ -1,9 +1,15 @@ set timeout=5 set default=0 +set gfxmode=1024x768x32 +set gfxpayload=keep + +serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 +terminal_input console serial +terminal_output console serial + menuentry "Dark Horse Linux (Pre-Alpha)" { set root=(cd) - linux /boot/vmlinuz-6.0.12-dark_horse-pyrois boot=live root=/dev/sr0 rw + linux /boot/vmlinuz-6.0.12-dark_horse-pyrois boot=live root=/dev/sr0 toram overlay tmpfs_size=50% rd.shell rd.debug systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M console=tty1 console=ttyS0,115200 initrd /boot/initramfs-6.0.12.img } - diff --git a/rex.project/x86_64/components/backup/offer_backup.bash b/rex.project/x86_64/components/backup/offer_backup.bash index af1946a..3d02a15 100755 --- a/rex.project/x86_64/components/backup/offer_backup.bash +++ b/rex.project/x86_64/components/backup/offer_backup.bash @@ -66,8 +66,6 @@ function perform_backup() { logprint "Re-arming chroot..." make arm_chroot echo - logprint "You may now proceed to run 'make build_stage4'." - echo } diff --git a/rex.project/x86_64/components/livecd/livecd.bash b/rex.project/x86_64/components/livecd/livecd.bash index f47fe62..1d53e9c 100755 --- a/rex.project/x86_64/components/livecd/livecd.bash +++ b/rex.project/x86_64/components/livecd/livecd.bash @@ -45,7 +45,7 @@ logprint "Emptying source stage..." rm -Rf ${TEMP_STAGE_DIR} assert_zero $? -rm -Rf /rex_embedded +rm -Rf ${T_SYSROOT}/rex_embedded assert_zero $? logprint "Generating initramfs..." @@ -56,11 +56,11 @@ ulimit -n 3000000 TERM="xterm-256color" \ PS1='\n(dark horse linux) [ \u @ \H ] << \w >>\n\n[- ' \ PATH=/usr/bin:/usr/sbin \ - dracut --force '' 6.0.12 + dracut -c /usr/etc/dracut.conf --force '' 6.0.12 assert_zero $? logprint "Generating bootable ISO" -grub2-mkrescue -o DHLP.iso ${T_SYSROOT} +grub2-mkrescue -o DHLP.iso -V "DHLP" ${T_SYSROOT} assert_zero $? logprint "Thanks for using Dark Horse Linux. Your experimental build is at '${dir_artifacts}/DHLP.iso'." diff --git a/rex.project/x86_64/components/stage5/linux.bash b/rex.project/x86_64/components/stage5/linux.bash index 144cb9e..012475b 100755 --- a/rex.project/x86_64/components/stage5/linux.bash +++ b/rex.project/x86_64/components/stage5/linux.bash @@ -140,6 +140,8 @@ mode_build() { cp -vf ${CONFIGS_DIR}/kernel_config ./.config assert_zero $? + make menuconfig + logprint "Compiling kernel" make assert_zero $?