Updates to /usr/etc/rc to deal with the new cd probing logic; ast@'s new motd

diff --git a/etc/motd b/etc/motd
index 7bfd963e49ad44581a79984343ccb7442030bbd3..e9bda076ece86676034998d21e9b70186c8e0002 100755 (executable)
--- 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 600fc1fcae7b8458769de97c5ef5ecbf29c44838..58c428ab0c5a63ad999d1f78fb99f525016cd8bd 100755 (executable)
--- 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.