From owner-svn-src-user@FreeBSD.ORG Sat Jan 8 18:30:08 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 6528B10656CD; Sat, 8 Jan 2011 18:30:08 +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 53E878FC13; Sat, 8 Jan 2011 18:30:08 +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 p08IU6qe000508; Sat, 8 Jan 2011 18:30:06 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p08IU6es000501; Sat, 8 Jan 2011 18:30:06 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101081830.p08IU6es000501@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 8 Jan 2011 18:30:06 +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: r217158 - in user/nwhitehorn/bsdinstall: . distextract distfetch libexec partedit scripts 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: Sat, 08 Jan 2011 18:30:08 -0000 Author: nwhitehorn Date: Sat Jan 8 18:30:06 2011 New Revision: 217158 URL: http://svn.freebsd.org/changeset/base/217158 Log: Provide a real build system that installs this software into real places. Subscripts go in /usr/libexec/bsdinstall, and the main bsdinstall binary goes in /usr/sbin. Also modify bsdinstall to run the "auto" verb by default if no other command is given. Added: user/nwhitehorn/bsdinstall/Makefile user/nwhitehorn/bsdinstall/scripts/Makefile Deleted: user/nwhitehorn/bsdinstall/libexec/ Modified: user/nwhitehorn/bsdinstall/NOTES user/nwhitehorn/bsdinstall/bsdinstall user/nwhitehorn/bsdinstall/distextract/Makefile user/nwhitehorn/bsdinstall/distfetch/Makefile user/nwhitehorn/bsdinstall/partedit/Makefile Added: user/nwhitehorn/bsdinstall/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/Makefile Sat Jan 8 18:30:06 2011 (r217158) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +BINDIR= /usr/sbin +SUBDIR= distextract distfetch partedit scripts +SCRIPTS= bsdinstall + +.include Modified: user/nwhitehorn/bsdinstall/NOTES ============================================================================== --- user/nwhitehorn/bsdinstall/NOTES Sat Jan 8 18:09:48 2011 (r217157) +++ user/nwhitehorn/bsdinstall/NOTES Sat Jan 8 18:30:06 2011 (r217158) @@ -13,3 +13,9 @@ Environment variables affecting modules: - BSDINSTALL_CHROOT: Destination location for the installation. File systems are mounted here and files installed to this path. +Install CD environment: +- Distfiles in /var/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 + Modified: user/nwhitehorn/bsdinstall/bsdinstall ============================================================================== --- user/nwhitehorn/bsdinstall/bsdinstall Sat Jan 8 18:09:48 2011 (r217157) +++ user/nwhitehorn/bsdinstall/bsdinstall Sat Jan 8 18:30:06 2011 (r217158) @@ -7,7 +7,11 @@ PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"; e BSDINSTALL_DISTDIR="/var/dist"; export BSDINSTALL_DISTDIR BSDINSTALL_CHROOT="/mnt"; export BSDINSTALL_CHROOT -VERB=$1 +VERB=$1; shift -exec $(dirname $0)/libexec/$VERB +if [ -z $VERB ]; then + VERB=auto +fi + +exec /usr/libexec/bsdinstall/$VERB $@ Modified: user/nwhitehorn/bsdinstall/distextract/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/distextract/Makefile Sat Jan 8 18:09:48 2011 (r217157) +++ user/nwhitehorn/bsdinstall/distextract/Makefile Sat Jan 8 18:30:06 2011 (r217158) @@ -1,5 +1,6 @@ # $FreeBSD $ +BINDIR= /usr/libexec/bsdinstall PROG= distextract LDADD= -larchive -lncursesw -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include Modified: user/nwhitehorn/bsdinstall/distfetch/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/distfetch/Makefile Sat Jan 8 18:09:48 2011 (r217157) +++ user/nwhitehorn/bsdinstall/distfetch/Makefile Sat Jan 8 18:30:06 2011 (r217158) @@ -1,5 +1,6 @@ # $FreeBSD $ +BINDIR= /usr/libexec/bsdinstall PROG= distfetch LDADD= -lfetch -lncursesw -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include Modified: user/nwhitehorn/bsdinstall/partedit/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/Makefile Sat Jan 8 18:09:48 2011 (r217157) +++ user/nwhitehorn/bsdinstall/partedit/Makefile Sat Jan 8 18:30:06 2011 (r217158) @@ -1,5 +1,6 @@ # $FreeBSD $ +BINDIR= /usr/libexec/bsdinstall PROG= partedit LDADD= -lgeom -lncursesw -lutil -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include Added: user/nwhitehorn/bsdinstall/scripts/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/scripts/Makefile Sat Jan 8 18:30:06 2011 (r217158) @@ -0,0 +1,8 @@ +# $FreeBSD $ + +SCRIPTS= auto adduser config hostname mount netconfig rootpass services time +BINDIR= /usr/libexec/bsdinstall + +NO_MAN= true + +.include