From 14eb9f1236e6e5b860053cfdf25b527f5b8b41a2 Mon Sep 17 00:00:00 2001
From: "Rodney W. Grimes" <rgrimes@FreeBSD.org>
Date: Mon, 21 Feb 1994 02:47:47 +0000
Subject: [PATCH] Put back in elvis recovery stuff, we still ship elvis with
 1.1 as a fall back editor!

Add nvi recovery precedure from man page.

Fix ntpdate echo lines so that it looks pretty (ntpdate spits out 1 line
of output that makes the system boot up look real ugly if you do it
echo -n, so I chaged it to echo, and then added a
echo -n 'starting more network daemons:' so any addition daemon starts
look normal.
---
 etc/rc | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/etc/rc b/etc/rc
index 16d98039ab07..3f7e8233401e 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.15 1994/01/22 20:44:13 guido Exp $
+#	$Id: rc,v 1.16 1994/02/02 08:02:37 chmr Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -127,6 +127,21 @@ then
 	'password file may be incorrect -- /etc/ptmp exists'
 fi
 
+# Recover elvis editor files.
+echo preserving editor files
+(cd /var/tmp && /usr/libexec/elvispreserve "-the system rebooted" elvis* &&
+	rm -f elvis[0-9a-f][0-9a-f][0-9a-f][0-9a-f]* \
+	elvis_[0-9a-f][0-9a-f][0-9a-f][0-9a-f]*)
+
+# Recover vi editor files.
+virecovery=/var/tmp/vi.recover/recover.*
+if [ "$virecovery" != "/var/tmp/vi.recover/recover.*" ]; then
+	echo 'Recovering vi editor sessions'
+	for i in $virecovery; do
+		sendmail -t < $i
+	done
+fi
+
 echo clearing /tmp
 
 # prune quickly with one rm, then use find to clean up /tmp/[lq]*
@@ -164,7 +179,8 @@ fi
 # If $ntpdate != NO, run ntpdate $ntpdate to set the date correctly.
 # If $xntpdflags != NO, start xntpd.
 if [ X"${ntpdate}" != X"NO" ]; then
-	echo -n ' ntpdate';	ntpdate $ntpdate
+	echo ' ntpdate';	ntpdate $ntpdate
+	echo -n 'starting more network daemons:'
 fi
 
 if [ X"${xntpdflags}" != X"NO" ]; then