From: Ben Gras <ben@minix3.org>
Date: Thu, 11 Aug 2005 11:32:37 +0000 (+0000)
Subject: Don't allow arbitrary ram disks being loaded any more, due to funny check.
X-Git-Tag: v3.1.0~373
X-Git-Url: http://zhaoyanbai.com/repos/jquery-3.1.1.min.js?a=commitdiff_plain;h=2382b9a1d35c5450ae7371dc4b992692cc6e0c53;p=minix.git

Don't allow arbitrary ram disks being loaded any more, due to funny check.
---

diff --git a/servers/fs/main.c b/servers/fs/main.c
index df4206b66..69676bf9f 100644
--- a/servers/fs/main.c
+++ b/servers/fs/main.c
@@ -6,8 +6,6 @@
  *   main:	main program of the File System
  *   reply:	send a reply to a process after the requested work is done
  *
- * Changes:
- *   Mar 23, 2005   allow arbitrary partitions as RAM disk  (Jorrit N. Herder)
  */
 
 struct super_block;		/* proto.h needs to know this */
@@ -292,7 +290,7 @@ PRIVATE void load_ram(void)
 	panic(__FILE__,"Cannot open root device",NO_NUM);
 
   /* If we must initialize a ram disk, get details from the image device. */
-  if (root_dev == DEV_RAM || root_dev != image_dev) {
+  if (root_dev == DEV_RAM) {
   	u32_t fsmax, probedev;
 
   	/* If we are running from CD, see if we can find it. */
@@ -362,7 +360,7 @@ PRIVATE void load_ram(void)
 #endif
 
   /* See if we must load the RAM disk image, otherwise return. */
-  if (root_dev != DEV_RAM && root_dev == image_dev)
+  if (root_dev != DEV_RAM)
   	return;
 
   /* Copy the blocks one at a time from the image to the RAM disk. */