From f0c870d6c1c95195c89d20788ee03a56ed66fbcd Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 15 Dec 2023 06:55:44 -0600 Subject: [PATCH] Replace panic=1 argument with PANIC_TIMEOUT=1 confg symbol, and automatically enable module plumbing if any $MODULES selected. --- mkroot/mkroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkroot/mkroot.sh b/mkroot/mkroot.sh index 7d7135f5..a0f7385c 100755 --- a/mkroot/mkroot.sh +++ b/mkroot/mkroot.sh @@ -253,7 +253,7 @@ else { echo DIR='"$(dirname $0)";' qemu-system-"$QEMU" -m 256 '"$@"' $QEMU_MORE \ -nographic -no-reboot -kernel '"$DIR"'/linux-kernel $INITRD \ ${DTB:+-dtb '"$DIR"'/linux.dtb} \ - "-append \"panic=1 HOST=$CROSS console=$KARGS \$KARGS\"" && + "-append \"HOST=$CROSS console=$KARGS \$KARGS\"" && echo "echo -e '\\e[?7h'" } > "$OUTPUT"/run-qemu.sh && chmod +x "$OUTPUT"/run-qemu.sh || exit 1 @@ -269,7 +269,7 @@ else echo -e "# make ARCH=$KARCH -j \$(nproc)\n# boot $VMLINUX\n\n" # Expand list of =y symbols, first generic then architecture-specific - for i in BINFMT_ELF,BINFMT_SCRIPT,NO_HZ,HIGH_RES_TIMERS,BLK_DEV,BLK_DEV_INITRD,RD_GZIP,BLK_DEV_LOOP,EXT4_FS,EXT4_USE_FOR_EXT2,VFAT_FS,FAT_DEFAULT_UTF8,NLS_CODEPAGE_437,NLS_ISO8859_1,MISC_FILESYSTEMS,SQUASHFS,SQUASHFS_XATTR,SQUASHFS_ZLIB,DEVTMPFS,DEVTMPFS_MOUNT,TMPFS,TMPFS_POSIX_ACL,NET,PACKET,UNIX,INET,IPV6,NETDEVICES,NET_CORE,NETCONSOLE,ETHERNET,COMPAT_32BIT_TIME,EARLY_PRINTK,IKCONFIG,IKCONFIG_PROC "$KCONF" "$KEXTRA" ; do + for i in BINFMT_ELF,BINFMT_SCRIPT,PANIC_TIMEOUT=1,NO_HZ,HIGH_RES_TIMERS,BLK_DEV,BLK_DEV_INITRD,RD_GZIP,BLK_DEV_LOOP,EXT4_FS,EXT4_USE_FOR_EXT2,VFAT_FS,FAT_DEFAULT_UTF8,NLS_CODEPAGE_437,NLS_ISO8859_1,MISC_FILESYSTEMS,SQUASHFS,SQUASHFS_XATTR,SQUASHFS_ZLIB,DEVTMPFS,DEVTMPFS_MOUNT,TMPFS,TMPFS_POSIX_ACL,NET,PACKET,UNIX,INET,IPV6,NETDEVICES,NET_CORE,NETCONSOLE,ETHERNET,COMPAT_32BIT_TIME,EARLY_PRINTK,IKCONFIG,IKCONFIG_PROC "$KCONF" ${MODULES+MODULES,MODULE_UNLOAD} "$KEXTRA" ; do echo "$i" >> "$OUTDOC"/linux-microconfig echo "# architecture ${X:-independent}" csv2cfg "$i" y -- 2.39.2