wok-next diff syslinux/stuff/iso2exe/boot.c @ rev 14257
syslinux/iso2exe: check kernel version, add floppy bootstrap stub
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Mar 28 11:51:42 2013 +0100 (2013-03-28) |
parents | b5ea41033c21 |
children | bf8be127c60b |
line diff
1.1 --- a/syslinux/stuff/iso2exe/boot.c Tue Feb 05 23:32:17 2013 +0100 1.2 +++ b/syslinux/stuff/iso2exe/boot.c Thu Mar 28 11:51:42 2013 +0100 1.3 @@ -39,7 +39,8 @@ 1.4 } 1.5 if (isoopen(mode)) 1.6 isoopen("bzImage"); 1.7 - loadkernel(); 1.8 + if (loadkernel() < 0x20630) 1.9 + init = ""; // Does not support multiple initramfs 1.10 isoopen(rootfs); 1.11 loadinitrd(); 1.12 lseek(isofd, 24, SEEK_SET); 1.13 @@ -87,7 +88,7 @@ 1.14 char *kernel, *initrd, *cmdline, *cmdfile, *s; 1.15 1.16 argv[0] = progname(); 1.17 - bootiso(argv); // iso ? parsing is /init.exe stuff ! 1.18 + bootiso(argv + (argc == 2)); // iso ? parsing is /init.exe stuff ! 1.19 1.20 chdirname(*argv); 1.21 cmdfile = "tazboot.cmd";