From owner-p4-projects@FreeBSD.ORG  Mon Aug  1 11:54:22 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9542E16A421; Mon,  1 Aug 2005 11:54:21 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 52BFD16A41F
	for <perforce@freebsd.org>; Mon,  1 Aug 2005 11:54:21 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0420843D4C
	for <perforce@freebsd.org>; Mon,  1 Aug 2005 11:54:21 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j71BsK2J076553
	for <perforce@freebsd.org>; Mon, 1 Aug 2005 11:54:20 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j71BsKh8076549
	for perforce@freebsd.org; Mon, 1 Aug 2005 11:54:20 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Mon, 1 Aug 2005 11:54:20 GMT
Message-Id: <200508011154.j71BsKh8076549@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81274 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Aug 2005 11:54:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=81274

Change 81274 by soc-andrew@soc-andrew_serv on 2005/08/01 11:54:04

	Add a window to explain how to get to a shell interface

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/installer/flow.c#4 edit
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.c#4 edit
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.h#2 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/installer/flow.c#4 (text+ko) ====

@@ -272,7 +272,7 @@
 	} else if (strcmp(dfui_response_get_action_id(r), "utilities") == 0) {
 		state = state_utilities_menu;
 	} else if (strcmp(dfui_response_get_action_id(r), "exit") == 0) {
-		state = NULL;
+		state = state_exit_live_cd;
         } else if (strcmp(dfui_response_get_action_id(r), "configure_netboot") == 0) {
                 state = state_setup_remote_installation_server;
 	} else if (strcmp(dfui_response_get_action_id(r), "reboot") == 0) {
@@ -349,7 +349,7 @@
 	} else if (strcmp(dfui_response_get_action_id(r), "utilities") == 0) {
 		state = state_utilities_menu;
 	} else if (strcmp(dfui_response_get_action_id(r), "exit") == 0) {
-		state = NULL;
+		state = state_exit_live_cd;
 	} else if (strcmp(dfui_response_get_action_id(r), "reboot") == 0) {
 		state = state_reboot;
 	}

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.c#4 (text+ko) ====

@@ -44,6 +44,7 @@
 
 void state_create_subpartitions(struct i_fn_args *);
 void state_install_os(struct i_fn_args *);
+void state_welcome(struct i_fn_args *);
 
 struct dist {
 	const char *name;
@@ -66,6 +67,39 @@
     { NULL, NULL }
 };
 
+void
+state_exit_live_cd(struct i_fn_args *a)
+{
+	struct dfui_form *f;
+	struct dfui_response *r;
+	struct dfui_dataset *ds;
+	int dist=0;
+
+	f = dfui_form_create(
+	    "exit_live_cd",
+	    _("Open a Shell"),
+	    _("To get to a live shell press <alt>+F3.\n"
+	      "To return press <alt>+F1."),
+	    _("TODO: Insert help"),
+
+	    "p", "role", "menu",
+
+	    "a", "ok", _("Return to Main Menu"), "", "", 
+	    "p", "accelerator", "ESC",
+
+	    NULL
+	);
+
+	if (!dfui_be_present(a->c, f, &r))
+		abort_backend();
+
+	/* Clean up */
+	dfui_form_free(f);
+	dfui_response_free(r);
+
+	state = state_welcome;
+}
+
 /*
  * state_select_dists: Choose what distributions to install.
  */

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.h#2 (text+ko) ====

@@ -27,6 +27,7 @@
 #ifndef __EXTRA_FLOW_H__
 #define __EXTRA_FLOW_H__
 
-void state_select_dists(struct i_fn_args *a);
+void state_select_dists(struct i_fn_args *);
+void state_exit_live_cd(struct i_fn_args *);
 
 #endif /* __EXTRA_FLOW_H__ */