sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix for checking CLEAN-ness of ramdisk image

Browse source 
. pre-cleanflag ("old") mkfs generates without CLEAN flag,
	  causing boot not working because imgrd disappears after 1st
	  close
	. fixed sanity check for this situation
	. disable imgrd disappearing in memory driver so
	  readonly mount succeeds in case it happens anyway
This commit is contained in:
Ben Gras 2011-12-23 15:02:35 +01:00
parent 94715d8e54
commit 51de979ed9
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/memory/memory.c
View file

@ -526,6 +526,7 @@ PRIVATE int m_block_close(dev_t minor)
} }
openct[minor]--; openct[minor]--;
#if 0
/* Special case: free initial ramdisk after it's been unmounted once. */ /* Special case: free initial ramdisk after it's been unmounted once. */
if(minor == IMGRD_DEV && openct[minor] == 0 && m_vaddrs[IMGRD_DEV]) { if(minor == IMGRD_DEV && openct[minor] == 0 && m_vaddrs[IMGRD_DEV]) {
vir_bytes vaddr, vlen; vir_bytes vaddr, vlen;
@ -547,6 +548,7 @@ PRIVATE int m_block_close(dev_t minor)
m_geom[IMGRD_DEV].dv_size= cvul64(0); m_geom[IMGRD_DEV].dv_size= cvul64(0);
m_vaddrs[IMGRD_DEV] = 0; m_vaddrs[IMGRD_DEV] = 0;
} }
#endif
return(OK); return(OK);
} }

1
drivers/ramdisk/Makefile
View file

@ -47,6 +47,7 @@ image: proto.gen mtab rc $(EXTRA)
then : ; \ then : ; \
else echo "CLEAN sanity check of image failed." ; \ else echo "CLEAN sanity check of image failed." ; \
echo "(Perhaps install current mkfs and fsck.)" ; \ echo "(Perhaps install current mkfs and fsck.)" ; \
rm -f image; false; \
fi fi
ahci: ../ahci/ahci ahci: ../ahci/ahci