fix for checking CLEAN-ness of ramdisk image

	. 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

diff --git a/drivers/memory/memory.c b/drivers/memory/memory.c
index e1433f15e8c09dad4b462691e1ffb4cc0f332961..e1805a01b7969a7e742689d850c14d525c15980f 100644 (file)
--- a/drivers/memory/memory.c
+++ b/drivers/memory/memory.c
@@ -526,6 +526,7 @@ PRIVATE int m_block_close(dev_t minor)
   }
   openct[minor]--;
 
+#if 0
   /* Special case: free initial ramdisk after it's been unmounted once. */
   if(minor == IMGRD_DEV && openct[minor] == 0 && m_vaddrs[IMGRD_DEV]) {
        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_vaddrs[IMGRD_DEV] = 0;
   }
+#endif
 
   return(OK);
 }

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index dacf0ffa161e4466fc3b3703d1d4705dd78c0332..72964e2944f4bbb175ff41d637a7c4ecb09d8bfd 100644 (file)
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -47,6 +47,7 @@ image:        proto.gen mtab rc $(EXTRA)
        then    : ;     \
        else    echo "CLEAN sanity check of image failed."      ;       \
                echo "(Perhaps install current mkfs and fsck.)" ;       \
+               rm -f image; false;             \
        fi
 
 ahci: ../ahci/ahci