From owner-p4-projects@FreeBSD.ORG Mon Jul 11 02:28:42 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 A88C016A420; Mon, 11 Jul 2005 02:28:39 +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 AEC7D16A41C for ; Mon, 11 Jul 2005 02:28:38 +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 7391543D46 for ; Mon, 11 Jul 2005 02:28:38 +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 j6B2Sctp056936 for ; Mon, 11 Jul 2005 02:28:38 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B2Scra056933 for perforce@freebsd.org; Mon, 11 Jul 2005 02:28:38 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 11 Jul 2005 02:28:38 GMT Message-Id: <200507110228.j6B2Scra056933@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 79950 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, 11 Jul 2005 02:28:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=79950 Change 79950 by soc-andrew@soc-andrew_serv on 2005/07/11 02:28:29 Get the BSD Installer to the point of creating the slices and partitions Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#4 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/installer/functions.c#2 edit .. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#2 edit .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#7 edit .. //depot/projects/soc2005/bsdinstaller/src/share/Makefile#2 edit .. //depot/projects/soc2005/bsdinstaller/src/share/bsdinstaller/Makefile#1 add .. //depot/projects/soc2005/bsdinstaller/src/share/bsdinstaller/cmdnames.conf#1 add Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#4 (text+ko) ==== @@ -3,10 +3,10 @@ # Script to create a patch and tarballs of files to use in release(7) # The files to diff -FILES="lib/Makefile usr.sbin/Makefile release/Makefile" +FILES="lib/Makefile usr.sbin/Makefile release/Makefile share/Makefile" # Dir's to create a tarball of:name for tarball -DIRS="contrib/bsdinstaller:base lib/bsdinstaller:lib usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release" +DIRS="contrib/bsdinstaller:base lib/bsdinstaller:lib usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release share/bsdinstaller:share" VENDOR="//depot/vendor/freebsd/src" BSDINS="//depot/projects/soc2005/bsdinstaller/src" ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/installer/functions.c#2 (text+ko) ==== @@ -113,7 +113,7 @@ a->temp_files = aura_dict_new(23, AURA_DICT_HASH); a->cmd_names = config_vars_new(); if (!config_vars_read(a, a->cmd_names, CONFIG_TYPE_SH, - "usr/local/share/dfuibe_installer/cmdnames.conf")) { + "usr/share/bsdinstaller/cmdnames.conf")) { i_log(a, "! ERROR: Couldn't read cmdnames config file"); i_fn_args_free(a); return(NULL); ==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#2 (text+ko) ==== @@ -44,6 +44,8 @@ sbin .. share + bsdinstaller + .. calendar de_DE.ISO8859-1 .. ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#7 (text+ko) ==== @@ -772,7 +772,9 @@ ( for dir in dev mnt proc root tmp usr var ; do \ mkdir ${RD}/bsdinstaller/root/$$dir; \ done ) + @echo "/dev/acd0 /usr cd9660 ro 0 0" > ${RD}/bsdinstaller/root/etc/fstab + ln -s /usr/boot ${RD}/bsdinstaller/root/boot @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf ==== //depot/projects/soc2005/bsdinstaller/src/share/Makefile#2 (text+ko) ==== @@ -3,7 +3,8 @@ # Do not include `info' in the SUBDIR list, it is handled separately. -SUBDIR= colldef \ +SUBDIR= bsdinstaller \ + colldef \ ${_dict} \ ${_doc} \ examples \