From 4f59e540e1cb9f7e0808ea79e4380400d8ed53f3 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Fri, 22 Jul 2005 18:38:48 +0000
Subject: [PATCH] Updates to /usr/etc/rc to deal with the new cd probing logic;
 ast@'s new motd

---
 etc/motd | 10 +++++++++-
 etc/rc   |  9 +++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/etc/motd b/etc/motd
index 7bfd963e4..e9bda076e 100755
--- a/etc/motd
+++ b/etc/motd
@@ -1,3 +1,11 @@
 
-This minix is an internal release.
+MINIX 3 is still under development and may contain bugs and other
+imperfections.  If you would like to help develop MINIX 3 further into a
+rock solid, reliable operating system, please go to the official Website:
+
+www.minix3.org
+
+to see how you can help.  That page also contains additional MINIX 3
+software, documentation, and information about the MINIX community.
+If you find a bug, please use the "Report a bug" link on that page.
 
diff --git a/etc/rc b/etc/rc
index 600fc1fca..58c428ab0 100755
--- a/etc/rc
+++ b/etc/rc
@@ -58,13 +58,14 @@ start)
     # If booting from CD, /usr has to be mounted readonly.
     # Also, $usr won't be specified correctly in the
     # fstab (the CD could be anywhere), so we decide
-    # where it is.
+    # where it is based on sysenv (set by FS when probing for CD).
     if [ "$bootcd" = 1 ]
     then	
-    		ramname="`/bin/sysenv ramimagedev_n`"
+    		imagedev="`/bin/sysenv cdproberoot`"
+    		usrdev="`expr $imagedev + 1`"
     		usr_roflag="-r"
-    		usr="/dev/c0`echo $ramname | sed 's/.*\(d.\).*/\1/'`p2"
-    		echo "Setting /usr to mount readonly from cd: $ramname -> $usr"
+    		usr="`/bin/dev2name $usrdev`"
+    		echo "Setting /usr to mount readonly from cd: $usrdev -> $usr"
     fi
  
     # Mount the /usr partition unless this is a single floppy Minix.