From owner-svn-src-user@FreeBSD.ORG Fri Jan 14 15:10:22 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2069F106567A; Fri, 14 Jan 2011 15:10:22 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E9B4A8FC1F; Fri, 14 Jan 2011 15:10:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0EFALGv091899; Fri, 14 Jan 2011 15:10:21 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0EFALt7091895; Fri, 14 Jan 2011 15:10:21 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101141510.p0EFALt7091895@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 14 Jan 2011 15:10:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217406 - in user/nwhitehorn/bsdinstall: . release X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jan 2011 15:10:22 -0000 Author: nwhitehorn Date: Fri Jan 14 15:10:21 2011 New Revision: 217406 URL: http://svn.freebsd.org/changeset/base/217406 Log: Make install CD stuff actually work automatically and update documentation. Modified: user/nwhitehorn/bsdinstall/NOTES user/nwhitehorn/bsdinstall/release/rc.local user/nwhitehorn/bsdinstall/release/testsystem.sh Modified: user/nwhitehorn/bsdinstall/NOTES ============================================================================== --- user/nwhitehorn/bsdinstall/NOTES Fri Jan 14 14:35:23 2011 (r217405) +++ user/nwhitehorn/bsdinstall/NOTES Fri Jan 14 15:10:21 2011 (r217406) @@ -14,8 +14,9 @@ Environment variables affecting modules: are mounted here and files installed to this path. Install CD environment: -- Distfiles in /var/dist +- Distfiles in /usr/bsdinstall-dist - tmpmfs and varmfs turn on automatically due to read-only media -- /etc/resolv.conf symlink to /tmp/etc/resolv.conf (propagates to new system) -- /boot/loader.conf set to run installer +- /etc/resolv.conf symlink to /tmp/bsdinstall_etc/resolv.conf + (propagates to new system) +- rc.local script to run installer Modified: user/nwhitehorn/bsdinstall/release/rc.local ============================================================================== --- user/nwhitehorn/bsdinstall/release/rc.local Fri Jan 14 14:35:23 2011 (r217405) +++ user/nwhitehorn/bsdinstall/release/rc.local Fri Jan 14 15:10:21 2011 (r217406) @@ -9,7 +9,7 @@ TERM=xterm; export TERM # XXX: serial consoles -cdialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 +dialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 case $? in $DIALOG_OK) # Install Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh ============================================================================== --- user/nwhitehorn/bsdinstall/release/testsystem.sh Fri Jan 14 14:35:23 2011 (r217405) +++ user/nwhitehorn/bsdinstall/release/testsystem.sh Fri Jan 14 15:10:21 2011 (r217406) @@ -2,6 +2,8 @@ # testsystem.sh +BSDINSTALL=`pwd`/.. + mkdir $2 # Kernel package @@ -40,6 +42,10 @@ cp $2/kernel.tgz $2/world.tgz $2/distrib ln -s /tmp/bsdinstall_etc/resolv.conf $1/etc/resolv.conf echo kernel_options=\"-C\" > $1/boot/loader.conf echo sendmail_enable=\"NONE\" > $1/etc/rc.conf -cp rc.local $1/etc -#mkisoimages.sh -b FreeBSD_Install $3 $1 +cd $BSDINSTALL +cp release/rc.local $1/etc +mkdir $1/usr/libexec/bsdinstall +make install DESTDIR=$1 + +sh /usr/src/release/i386/mkisoimages.sh -b FreeBSD_Install $3 $1