diff -Nru palo-2.23/debian/changelog palo-2.24/debian/changelog --- palo-2.23/debian/changelog 2023-05-21 08:41:01.000000000 +0000 +++ palo-2.24/debian/changelog 2023-05-30 12:10:51.000000000 +0000 @@ -1,3 +1,10 @@ +palo (2.24) unstable; urgency=medium + + [ Helge Deller ] + * ipl: Fix loading of ramdisk in qemu + + -- Helge Deller Tue, 30 May 2023 14:10:51 +0200 + palo (2.23) unstable; urgency=medium [ Helge Deller ] diff -Nru palo-2.23/ipl/ipl.c palo-2.24/ipl/ipl.c --- palo-2.23/ipl/ipl.c 2023-05-21 08:41:01.000000000 +0000 +++ palo-2.24/ipl/ipl.c 2023-05-30 12:10:51.000000000 +0000 @@ -443,15 +443,18 @@ /* turn on firmware manufacturing mode on C8000 workstation */ if (numbuf[0] == 'm') { /* hidden option! */ const char *model = get_machine_model(); + join(commandline, argc, argv, ok); if (strncmp(model, "9000/785/C8000", 14) == 0) { *(unsigned char *)0xfffffff0f04300a0 = 0x4d; pdc_do_reset(); } printf("unknown machine - can not enable manufacturing mode\n"); + continue; } if (numbuf[0] == 'd') /* hidden option! */ { + join(commandline, argc, argv, ok); Debug = !Debug; printf("Debug mode is now %s\n", Debug ? "on":"off"); if (Debug) @@ -693,9 +696,14 @@ /* If we have any failures after this, be sure we're interactive * for the re-start */ interactive = 1; + ok = 1; + if (Debug) printf("commandline %s\n", commandline); strcpy(commandline, parse(commandline, &kern_part, kern_name, &rd_part, rd_name)); + if (Debug) printf("commandline %s\n", commandline); + if (Debug) printf("kernel %s part %d\n", kern_name, kern_part); + if (Debug) printf("rd %s part %d\n", rd_name, rd_part); sprintf(kern_fullname, "%d%s", kern_part, kern_name); chk_strcat(commandline, " palo_kernel=", CMDLINELEN, &ok); Binary files /tmp/tmpin98x6lb/P146W23wSG/palo-2.23/iplboot and /tmp/tmpin98x6lb/2nBEtGTpFs/palo-2.24/iplboot differ diff -Nru palo-2.23/lib/common.h palo-2.24/lib/common.h --- palo-2.23/lib/common.h 2023-05-21 08:41:01.000000000 +0000 +++ palo-2.24/lib/common.h 2023-05-30 12:10:51.000000000 +0000 @@ -9,7 +9,7 @@ */ #define PALOMAGIC "PALO" -#define PALOVERSION "2.23" +#define PALOVERSION "2.24" #ifndef __ASSEMBLY__