Release process to use and create 16MB root; FS setcache call removed

diff --git a/drivers/libdriver/drvlib.c b/drivers/libdriver/drvlib.c
index 7a8e1135feb9c0b5abfde340c89b10ccc2b8127d..c0605970004ad31b01fa4c33137a9d30fcc24c95 100644 (file)
--- a/drivers/libdriver/drvlib.c
+++ b/drivers/libdriver/drvlib.c
@@ -228,7 +228,7 @@ struct part_entry *table;   /* four entries */
   memcpy(&isosize, pvd + 80, sizeof(isosize));
   isosize *= CD_SECTOR_SIZE;
 
-#define ROOT_IMAGE_SECTORS (1440*1024/SECTOR_SIZE)
+#define ROOT_IMAGE_SECTORS (16*1024*1024/SECTOR_SIZE)
   table[0].lowsec = 0;
   table[0].size =  isosize / SECTOR_SIZE;
 

diff --git a/lib/other/Makefile b/lib/other/Makefile
index 7808c02af67451abd6ac5cf93fc2336b5518d09f..1654def69186cfd2e10b4629644d908fc065256c 100755 (executable)
--- a/lib/other/Makefile
+++ b/lib/other/Makefile
@@ -47,7 +47,6 @@ OBJECTS       = \
        $(LIBRARY)(popen.o) \
        $(LIBRARY)(putenv.o) \
        $(LIBRARY)(putw.o) \
-       $(LIBRARY)(setcache.o) \
        $(LIBRARY)(stderr.o) \
        $(LIBRARY)(swab.o) \
        $(LIBRARY)(syscall.o) \
@@ -189,9 +188,6 @@ $(LIBRARY)(putw.o): putw.c
 $(LIBRARY)(rindex.o):  rindex.c
        $(CC1) rindex.c
 
-$(LIBRARY)(setcache.o):        setcache.c
-       $(CC1) setcache.c
-
 $(LIBRARY)(stderr.o):  stderr.c
        $(CC1) stderr.c
 

diff --git a/lib/other/setcache.c b/lib/other/setcache.c
deleted file mode 100644 (file)
index 6e516ed..0000000
--- a/lib/other/setcache.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#include <minix/config.h>
-
-#include <lib.h>
-#include <unistd.h>
-#include <minix/type.h>
-#include <minix/com.h>
-
-int
-setcache(int kb)
-{
-  message m;
-  int r;
-
-  m.m1_i1 = kb;
-  m.m_type = SETCACHE;
-  if ((r=_syscall(FS, SETCACHE, &m)) < 0)
-       return(-1);
-
-  return(m.m_type);
-}

diff --git a/tools/release.sh b/tools/release.sh
index 6c95bc2d4677e2fe2316be7952122241aa342f06..6a8e3e28bb4b24e484b31129360b433a7dfe10cd 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -6,8 +6,11 @@ IMAGE=cdfdimage
 ROOTIMAGE=rootimage
 ISO=minix.iso
 RAM=/dev/ram
-if [ `wc -c $RAM | awk '{ print $1 }'` -ne 1474560 ]
-then   echo "$RAM should be exactly 1440k."
+rootmb=16
+rootkb=`expr $rootmb \* 1024`
+rootbytes=`expr $rootkb \* 1024`
+if [ `wc -c $RAM | awk '{ print $1 }'` -ne $rootbytes ]
+then   echo "$RAM should be exactly ${rootkb}k."
        exit 1
 fi
 echo "Warning: I'm going to mkfs $RAM!"
@@ -19,6 +22,7 @@ read dev || exit 1
 TMPDISK=/dev/$dev
 
 echo "Temporary (sub)partition to use for storage in /tmp?"
+echo "It will be mkfsed!"
 echo -n "Device: /dev/"
 read tmpdev || exit 1
 TMPTMPDISK=/dev/$tmpdev
@@ -47,9 +51,11 @@ echo " * mounting $RAM as $RELEASEDIR"
 mount $RAM $RELEASEDIR || exit
 mkdir -m 755 $RELEASEDIR/usr
 mkdir -m 1777 $RELEASEDIR/tmp
+umount $TMPTMPDISK 
+mkfs $TMPTMPDISK || exit
 mount $TMPTMPDISK $RELEASEDIR/tmp || exit 1
 
-mkfs -B 1024 $TMPDISK
+mkfs -B 1024 $TMPDISK || exit
 echo " * mounting $TMPDISK as $RELEASEDIR/usr"
 mount $TMPDISK $RELEASEDIR/usr || exit
 mkdir -p $RELEASEDIR/tmp