svn commit: r217163 - head/sys/kern

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Jan  8 19:50:13 2011
New Revision: 217163
URL: http://svn.freebsd.org/changeset/base/217163

Log:
  Make RB_CDROM work. This should probably check for a disc in cd1 and acd1
  as well.

Modified:
  head/sys/kern/vfs_mountroot.c

Modified: head/sys/kern/vfs_mountroot.c
==============================================================================
--- head/sys/kern/vfs_mountroot.c	Sat Jan  8 19:49:27 2011	(r217162)
+++ head/sys/kern/vfs_mountroot.c	Sat Jan  8 19:50:13 2011	(r217163)
@@ -831,9 +831,9 @@ vfs_mountroot_conf0(struct sbuf *sb)
 		sbuf_printf(sb, "%s\n", ROOTDEVNAME);
 #endif
 	if (boothowto & RB_CDROM) {
-		sbuf_printf(sb, "cd9660:cd0\n");
+		sbuf_printf(sb, "cd9660:/dev/cd0 ro\n");
 		sbuf_printf(sb, ".timeout 0\n");
-		sbuf_printf(sb, "cd9660:acd0\n");
+		sbuf_printf(sb, "cd9660:/dev/acd0 ro\n");
 		sbuf_printf(sb, ".timeout %d\n", root_mount_timeout);
 	}
 	s = getenv("vfs.root.mountfrom");