[src/netbsd-1-5]: src/distrib/sparc/miniroot Pullup 1.8 [pk]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1142d179f5f
branches:  netbsd-1-5
changeset: 490059:c1142d179f5f
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 01 03:15:43 2000 +0000

description:
Pullup 1.8 [pk]:
* Add code to start sysinst with a writable /tmp directory (a necessity if the
  root is on a CD).
* When returning from an escape to shell, stay in the main loop.

diffstat:

 distrib/sparc/miniroot/dot.profile |  24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r 620abf18912c -r c1142d179f5f distrib/sparc/miniroot/dot.profile
--- a/distrib/sparc/miniroot/dot.profile        Wed Nov 01 03:14:48 2000 +0000
+++ b/distrib/sparc/miniroot/dot.profile        Wed Nov 01 03:15:43 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.6.2.1 2000/10/19 14:24:22 tv Exp $
+# $NetBSD: dot.profile,v 1.6.2.2 2000/11/01 03:15:43 tv Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -65,10 +65,10 @@
                cat <<'EOF'
 
 This distribution contains the experimental `sysinst' installation tool.
-To use it, escape to the shell (option (S) below), then type `/sysinst'.
+If you feel like trying it out, choose option (X) below.
 
 EOF
-               echo -n '(I)nstall, (U)pgrade, (H)alt or (S)hell ? '
+               echo -n '(I)nstall, (U)pgrade, (H)alt or (S)hell or (X)? '
                read _forceloop
                case "$_forceloop" in
                        i*|I*)
@@ -80,11 +80,27 @@
                                ;;
 
                        h*|H*)
-                               /sbin/halt
+                               #
+                               # XXX - if we're piggybacking a microroot, then
+                               # exit from this (chroot) environment: the
+                               # microroot's .profile will halt the machine.
+                               #
+                               if [ "$BOOTFS_DONEPROFILE" = YES ]; then
+                                       exit
+                               else
+                                       /sbin/halt
+                               fi
                                ;;
 
                        s*|S*)
                                /bin/sh
+                               continue
+                               ;;
+
+                       x*|X*)
+                               # setup a writable /tmp directory
+                               mount_mfs swap /tmp || continue
+                               /sysinst
                                ;;
 
                        *)