From owner-p4-projects@FreeBSD.ORG Mon Jul 25 07:19:37 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EDDC16A421; Mon, 25 Jul 2005 07:19:37 +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 E5ECB16A41F for ; Mon, 25 Jul 2005 07:19:36 +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 8E4DB43D5F for ; Mon, 25 Jul 2005 07:19:36 +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 j6P7Jaxc087799 for ; Mon, 25 Jul 2005 07:19:36 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6P7Jaj6087796 for perforce@freebsd.org; Mon, 25 Jul 2005 07:19:36 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 25 Jul 2005 07:19:36 GMT Message-Id: <200507250719.j6P7Jaj6087796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2005 07:19:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=80946 Change 80946 by soc-andrew@soc-andrew_serv on 2005/07/25 07:19:25 Reboot when asked to by the backend Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#2 (text+ko) ==== @@ -2,12 +2,24 @@ TTY=`tty` +if [ -f /.do_reboot ] +then + # The reboot should have begun after 60s + sleep 60 +fi + if [ ${TTY} = "/dev/ttyv0" ] then /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then /usr/sbin/bsd_installer_be + if [ $? -eq 5 ] + then +# The backend returned the reboot value + shutdown -r now + touch /.do_reboot + fi else echo "Error: bsdinstaller can only login on ttyv0 or ttyv1" fi