From: David van Moolenbroek <david@minix3.org>
Date: Thu, 18 Sep 2014 12:59:18 +0000 (+0000)
Subject: Revert "Temporarily disable the is9600 FS server"
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F2835%2F1;p=minix.git

Revert "Temporarily disable the is9600 FS server"

This reverts commit ab5c98ee5a2332a1f64b55fa3d056b675b2252ef.
---

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index b20cf1976..3a8d7b5e1 100644
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -159,7 +159,7 @@
 ./service/input				minix-sys
 ./service/ipc				minix-sys
 ./service/is				minix-sys
-./service/isofs				minix-sys	oboslete
+./service/isofs				minix-sys
 ./service/log				minix-sys
 ./service/lwip				minix-sys
 ./service/memory			minix-sys
diff --git a/minix/fs/Makefile b/minix/fs/Makefile
index b3d26f5a2..0c17c45c1 100644
--- a/minix/fs/Makefile
+++ b/minix/fs/Makefile
@@ -5,8 +5,7 @@ SUBDIR+=	pfs
 
 .if ${MKIMAGEONLY} == "no"
 SUBDIR+=	ext2
-#LSC: Commented until the fixed version is ready to be merged in.
-#SUBDIR+=	iso9660fs
+SUBDIR+=	iso9660fs
 SUBDIR+=	procfs
 
 .  if ${MACHINE_ARCH} == "i386"