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

Up lz4 (1.8.3)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Oct 05 23:02:32 2018 +0200 (2018-10-05)
parents bcdfc23ee041
children 7b15fbf27388
line diff
     1.1 --- a/linld/stuff/src/TAZBOOT.CPP	Sat Sep 29 15:27:00 2018 +0200
     1.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Fri Oct 05 23:02:32 2018 +0200
     1.3 @@ -20,7 +20,7 @@
     1.4  static void next_chunk(struct image_himem *m)
     1.5  {
     1.6  	struct initrd_info *i = &initrd_state.info[m->state];
     1.7 -	m->chunk_size = 0;
     1.8 +	m->chunk_size &= 0;
     1.9  	if (m->state >= initrd_state.cnt) return;
    1.10  	lseekset(m->fd,i->ofs);
    1.11  	m->chunk_size = i->size;
    1.12 @@ -49,7 +49,7 @@
    1.13  	if (!m->size) return;
    1.14  	m->next_chunk = next_chunk;
    1.15  	m->fd = isofd;
    1.16 -	m->state = 0;
    1.17 +	m->state &= 0;
    1.18  	next_chunk(m);
    1.19  	load_initrd();
    1.20  }
    1.21 @@ -76,7 +76,8 @@
    1.22  	if (!*iso || isoreset(*iso) < 0) return;
    1.23  	skip_alloc++;
    1.24  	base_himem = memtop() /2;
    1.25 -	if (base_himem > _64m) base_himem = _64m;
    1.26 +	//if (base_himem > _64m) base_himem = _64m;
    1.27 +	if (* ((char *) &base_himem +3) >= 4) base_himem = _64m;
    1.28  	isoopen("boot") >= 0 ||
    1.29  	isoopen("live") >= 0 ||	// debian
    1.30  	isoopen("casper") >= 0;	// ubuntu