wok diff linld/stuff/src/TAZBOOT.CPP @ rev 19546

linld/tazboot: default conf in tazboot.cmd
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Dec 06 18:49:44 2016 +0100 (2016-12-06)
parents 7f92b23984dc
children e428345df29a
line diff
     1.1 --- a/linld/stuff/src/TAZBOOT.CPP	Fri Dec 02 12:37:59 2016 +0100
     1.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Tue Dec 06 18:49:44 2016 +0100
     1.3 @@ -144,11 +144,9 @@
     1.4  	char *iso = NULL;
     1.5  	argv[0] = progname();
     1.6  	bootiso(argv);	// iso ? parsing is /init.exe stuff !
     1.7 -	if (argc >= 2)
     1.8 -		bootiso(argv + 1);
     1.9  
    1.10 -	chdirname(*argv);
    1.11  	if (argc < 2) {
    1.12 +		try_default_args();
    1.13  dousage:
    1.14  		die("Usage: tazboot [[@commands]|[-f][kernel=<bzimage>] \
    1.15  [initrd=<rootfs>[,<rootfs2>...]] [bootfrom=<isofile>] ...]\r\n\n\
    1.16 @@ -161,8 +159,12 @@
    1.17    kernel=\\slitaz\\elks\r\n\
    1.18    root=/dev/bda1 ro\r\n");
    1.19  	}
    1.20 +	bootiso(argv + 1);
    1.21 +	chdirname(*argv);
    1.22  	for (int i=0;;) {
    1.23 -		char *s=*++argv;
    1.24 +		char *s;
    1.25 +		argv++;
    1.26 +		s=*argv;
    1.27  		i++;
    1.28  		if (!s) break;
    1.29  		if (strhead(s,"kernel=") == 0) {