From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 18:23:20 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 2B5A71065670; Sun, 23 Jan 2011 18:23:20 +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 0079C8FC14; Sun, 23 Jan 2011 18:23:20 +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 p0NINJkB063626; Sun, 23 Jan 2011 18:23:19 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NINJ5M063624; Sun, 23 Jan 2011 18:23:19 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101231823.p0NINJ5M063624@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 18:23:19 +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: r217757 - user/nwhitehorn/bsdinstall/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: Sun, 23 Jan 2011 18:23:20 -0000 Author: nwhitehorn Date: Sun Jan 23 18:23:19 2011 New Revision: 217757 URL: http://svn.freebsd.org/changeset/base/217757 Log: Make network installations work. Still no mirror selection. Next up (after that) will be wireless configuration, to be shared with pc-sysinstall. Modified: user/nwhitehorn/bsdinstall/scripts/auto Modified: user/nwhitehorn/bsdinstall/scripts/auto ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Sun Jan 23 17:20:11 2011 (r217756) +++ user/nwhitehorn/bsdinstall/scripts/auto Sun Jan 23 18:23:19 2011 (r217757) @@ -5,7 +5,7 @@ echo "Begun Installation at $(date)" > $ error() { dialog --backtitle "FreeBSD Installer" --title "Abort" \ --no-label "Exit" --yes-label "Restart" --yesno \ - "You have canceled an installation step. Would you like to restart the installation or exit the installer?" 0 0 + "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 if [ $? -ne 0 ]; then exit else @@ -31,7 +31,7 @@ for dist in $DISTRIBUTIONS; do fi done -if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then +if [ ! -z "$FETCH_DISTRIBUTIONS" -a ! -z $BSDINSTALL_CONFIGCURRENT ]; then dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 bsdinstall netconfig || error NETCONFIG_DONE=yes @@ -63,11 +63,25 @@ case $? in ;; esac -if [ ! -z $FETCH_DISTRIBUTIONS ]; then - ALL_DISTRIBUTIONS=$DISTRIBUTIONS - DISTRIBUTIONS=$FETCH_DISTRIBUTIONS +if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then + ALL_DISTRIBUTIONS="$DISTRIBUTIONS" + + # Download to a directory in the new system as scratch space + BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/bsdinstall-dist" + mkdir -p "$BSDINSTALL_FETCHDEST" || error + + export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS" + # Try to use any existing distfiles + [ -d $BSDINSTALL_DISTDIR -a "$FETCH_DISTRIBUTIONS" != "$ALL_DISTRIBUTIONS" ] && mount_unionfs "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR" + + # Otherwise, fetch everything + if [ $? -ne 0 ]; then + export DISTRIBUTIONS="$ALL_DISTRIBUTIONS" + export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST" + fi + bsdinstall distfetch || error - DISTRIBUTIONS=$ALL_DISTRIBUTIONS + export DISTRIBUTIONS="$ALL_DISTRIBUTIONS" fi bsdinstall distextract || error @@ -84,5 +98,11 @@ bsdinstall adduser trap error SIGINT # SIGINT is bad again bsdinstall config || error +if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then + [ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \ + umount "$BSDINSTALL_DISTDIR" + rm -rf "$BSDINSTALL_FETCHDEST" +fi + echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 18:41:17 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 1B9691065670; Sun, 23 Jan 2011 18:41:17 +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 0AF228FC12; Sun, 23 Jan 2011 18:41:17 +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 p0NIfG4s064029; Sun, 23 Jan 2011 18:41:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NIfGSY064026; Sun, 23 Jan 2011 18:41:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101231841.p0NIfGSY064026@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 18:41:16 +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: r217758 - user/nwhitehorn/bsdinstall/distfetch 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: Sun, 23 Jan 2011 18:41:17 -0000 Author: nwhitehorn Date: Sun Jan 23 18:41:16 2011 New Revision: 217758 URL: http://svn.freebsd.org/changeset/base/217758 Log: Avoid wraparound in progress bars on systems with 32-bit size_t. Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c ============================================================================== --- user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sun Jan 23 18:23:19 2011 (r217757) +++ user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sun Jan 23 18:41:16 2011 (r217758) @@ -41,11 +41,11 @@ fetch_files(int nfiles, char **urls) const char **items; FILE *fetch_out, *file_out; struct url_stat ustat; - off_t total_bytes, current_bytes; + off_t total_bytes, current_bytes, fsize; char status[8]; char errormsg[512]; uint8_t block[4096]; - size_t chunk, fsize; + size_t chunk; int i, progress, last_progress; int nsuccess = 0; /* Number of files successfully downloaded */ From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 18:43:17 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 810B3106564A; Sun, 23 Jan 2011 18:43:17 +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 38D428FC0C; Sun, 23 Jan 2011 18:43:17 +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 p0NIhHAD064111; Sun, 23 Jan 2011 18:43:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NIhHZ1064109; Sun, 23 Jan 2011 18:43:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101231843.p0NIhHZ1064109@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 18:43:17 +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: r217759 - user/nwhitehorn/bsdinstall/distfetch 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: Sun, 23 Jan 2011 18:43:17 -0000 Author: nwhitehorn Date: Sun Jan 23 18:43:16 2011 New Revision: 217759 URL: http://svn.freebsd.org/changeset/base/217759 Log: Unbreak on amd64. Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c ============================================================================== --- user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sun Jan 23 18:41:16 2011 (r217758) +++ user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sun Jan 23 18:43:16 2011 (r217759) @@ -132,7 +132,7 @@ fetch_files(int nfiles, char **urls) __DECONST(char **, items)); } - if (ustat.size > 0 && fsize < (size_t)ustat.size) { + if (ustat.size > 0 && fsize < ustat.size) { if (fetchLastErrCode == 0) snprintf(errormsg, sizeof(errormsg), "Error while fetching %s: %s\n", From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 22:26:03 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 D372D106566C; Sun, 23 Jan 2011 22:26:03 +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 C31098FC1C; Sun, 23 Jan 2011 22:26:03 +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 p0NMQ3rF069310; Sun, 23 Jan 2011 22:26:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NMQ3XY069308; Sun, 23 Jan 2011 22:26:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101232226.p0NMQ3XY069308@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 22:26:03 +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: r217761 - user/nwhitehorn/bsdinstall/partedit 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: Sun, 23 Jan 2011 22:26:03 -0000 Author: nwhitehorn Date: Sun Jan 23 22:26:03 2011 New Revision: 217761 URL: http://svn.freebsd.org/changeset/base/217761 Log: Default to the default partition scheme. Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 23 19:36:28 2011 (r217760) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 23 22:26:03 2011 (r217761) @@ -61,9 +61,11 @@ gpart_partition(const char *lg_name, con schememenu: if (scheme == NULL) { + dialog_vars.default_item = __DECONST(char *, default_scheme()); cancel = dlg_menu("Partition Scheme", "Select a partition scheme for this volume:", 0, 0, 0, sizeof(items) / sizeof(items[0]), items, &choice, NULL); + dialog_vars.default_item = NULL; if (cancel) return (-1); From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 22:27:52 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 1F13F106564A; Sun, 23 Jan 2011 22:27:52 +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 0E0228FC08; Sun, 23 Jan 2011 22:27:52 +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 p0NMRpHd069380; Sun, 23 Jan 2011 22:27:51 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NMRpLn069377; Sun, 23 Jan 2011 22:27:51 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101232227.p0NMRpLn069377@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 22:27:51 +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: r217762 - in user/nwhitehorn/bsdinstall: distextract 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: Sun, 23 Jan 2011 22:27:52 -0000 Author: nwhitehorn Date: Sun Jan 23 22:27:51 2011 New Revision: 217762 URL: http://svn.freebsd.org/changeset/base/217762 Log: distextract was not setting permissions appropriately, for reasons I do not understand. Fix that, and simplify the code a little. libarchive does not like overlaid directories with some kinds of set flags, so roll the distribution files into the 'world' archive for now. This is slightly bogus, but unavoidable. Reported by: rwatson Modified: user/nwhitehorn/bsdinstall/distextract/distextract.c user/nwhitehorn/bsdinstall/release/testsystem.sh Modified: user/nwhitehorn/bsdinstall/distextract/distextract.c ============================================================================== --- user/nwhitehorn/bsdinstall/distextract/distextract.c Sun Jan 23 22:26:03 2011 (r217761) +++ user/nwhitehorn/bsdinstall/distextract/distextract.c Sun Jan 23 22:27:51 2011 (r217762) @@ -37,13 +37,10 @@ extract_files(int nfiles, const char **f char path[PATH_MAX]; int archive_files[nfiles]; int total_files, current_files, archive_file; - struct archive *archive, *disk; + struct archive *archive; struct archive_entry *entry; char errormsg[512]; char status[8]; - const void *block; - size_t bsize; - off_t offset; int i, err, progress, last_progress; err = 0; @@ -90,12 +87,6 @@ extract_files(int nfiles, const char **f } current_files = 0; - disk = archive_write_disk_new(); - archive_write_disk_set_options(disk, ARCHIVE_EXTRACT_TIME | - ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_ACL | - ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_OWNER | - ARCHIVE_EXTRACT_XATTR); - archive_write_disk_set_standard_lookup(disk); for (i = 0; i < nfiles; i++) { archive = archive_read_new(); @@ -122,24 +113,13 @@ extract_files(int nfiles, const char **f progress, nfiles, __DECONST(char **, items)); - err = archive_write_header(disk, entry); - if (err != ARCHIVE_OK) - break; - - while (1) { - err = archive_read_data_block(archive, - &block, &bsize, &offset); - if (err != ARCHIVE_OK) - break; - err = archive_write_data_block(disk, - block, bsize, offset); - if (err != ARCHIVE_OK) - break; - } + err = archive_read_extract(archive, entry, + ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_OWNER | + ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_ACL | + ARCHIVE_EXTRACT_XATTR | ARCHIVE_EXTRACT_FFLAGS); - if (err != ARCHIVE_EOF) + if (err != ARCHIVE_OK) break; - archive_write_finish_entry(disk); archive_file++; current_files++; @@ -148,15 +128,9 @@ extract_files(int nfiles, const char **f items[i*2 + 1] = "Done"; if (err != ARCHIVE_EOF) { - const char *errstring; - if (archive_errno(archive) != 0) - errstring = archive_error_string(archive); - else - errstring = archive_error_string(disk); - snprintf(errormsg, sizeof(errormsg), "Error while extracting %s: %s\n", items[i*2], - errstring); + archive_error_string(archive)); items[i*2 + 1] = "Failed"; dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE); Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh ============================================================================== --- user/nwhitehorn/bsdinstall/release/testsystem.sh Sun Jan 23 22:26:03 2011 (r217761) +++ user/nwhitehorn/bsdinstall/release/testsystem.sh Sun Jan 23 22:27:51 2011 (r217762) @@ -15,33 +15,26 @@ tar cvzf $2/kernel.tgz . chflags -R noschg . rm -rf $1 -# Distribution -cd /usr/src -mkdir $1 -make distrib-dirs distribution DESTDIR=$1 -cd $1 -tar cvzf $2/distribution.tgz . -chflags -R noschg . -rm -rf $1 - # World cd /usr/src mkdir $1 -make installworld DESTDIR=$1 +make installworld distribution DESTDIR=$1 cd $1 tar cvzf $2/world.tgz . # Keep world around # Make system cd /usr/src -make installkernel distribution DESTDIR=$1 +make installkernel DESTDIR=$1 mkdir $1/usr/bsdinstall-dist -cp $2/kernel.tgz $2/world.tgz $2/distribution.tgz $1/usr/bsdinstall-dist +cp $2/kernel.tgz $2/world.tgz $1/usr/bsdinstall-dist # Things for the CD environment 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 +echo hostid_enable=\"NO\" >> $1/etc/rc.conf +touch $1/etc/fstab cd $BSDINSTALL cp release/rc.local $1/etc From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 22:39:31 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 A950F106566B; Sun, 23 Jan 2011 22:39:31 +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 98B548FC0C; Sun, 23 Jan 2011 22:39:31 +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 p0NMdVb1069708; Sun, 23 Jan 2011 22:39:31 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NMdVx9069706; Sun, 23 Jan 2011 22:39:31 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101232239.p0NMdVx9069706@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 22:39:31 +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: r217763 - 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: Sun, 23 Jan 2011 22:39:31 -0000 Author: nwhitehorn Date: Sun Jan 23 22:39:31 2011 New Revision: 217763 URL: http://svn.freebsd.org/changeset/base/217763 Log: Put bsdinstall into the installed system. Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh ============================================================================== --- user/nwhitehorn/bsdinstall/release/testsystem.sh Sun Jan 23 22:27:51 2011 (r217762) +++ user/nwhitehorn/bsdinstall/release/testsystem.sh Sun Jan 23 22:39:31 2011 (r217763) @@ -19,6 +19,12 @@ rm -rf $1 cd /usr/src mkdir $1 make installworld distribution DESTDIR=$1 + +# Install BSDinstall as though it were part of world +mkdir $1/usr/libexec/bsdinstall +cd $BSDINSTALL +make install DESTDIR=$1 + cd $1 tar cvzf $2/world.tgz . # Keep world around @@ -35,10 +41,7 @@ echo kernel_options=\"-C\" > $1/boot/loa echo sendmail_enable=\"NONE\" > $1/etc/rc.conf echo hostid_enable=\"NO\" >> $1/etc/rc.conf touch $1/etc/fstab - 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 From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 23:06:15 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 74DD6106564A; Sun, 23 Jan 2011 23:06:15 +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 49C258FC18; Sun, 23 Jan 2011 23:06:15 +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 p0NN6FWo070296; Sun, 23 Jan 2011 23:06:15 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NN6FAc070293; Sun, 23 Jan 2011 23:06:15 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101232306.p0NN6FAc070293@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 23:06:15 +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: r217764 - user/nwhitehorn/bsdinstall/partedit 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: Sun, 23 Jan 2011 23:06:15 -0000 Author: nwhitehorn Date: Sun Jan 23 23:06:15 2011 New Revision: 217764 URL: http://svn.freebsd.org/changeset/base/217764 Log: Exclude swap-backed md devices from lists of available install targets. The install CD creates some of these for /var and /tmp, and they are fundamentally infeasible install targets. vnode-backed md devices remain, since they can be used as disk images for virtual machines. Requested by: rwatson Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c user/nwhitehorn/bsdinstall/partedit/partedit.c Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/part_wizard.c Sun Jan 23 22:39:31 2011 (r217763) +++ user/nwhitehorn/bsdinstall/partedit/part_wizard.c Sun Jan 23 23:06:15 2011 (r217764) @@ -57,9 +57,11 @@ static char * boot_disk(struct gmesh *mesh) { struct gclass *classp; + struct gconfig *gc; struct ggeom *gp; struct gprovider *pp; DIALOG_LISTITEM *disks = NULL; + const char *type; char diskdesc[512]; char *chosen; int i, err, selected, n = 0; @@ -74,6 +76,16 @@ boot_disk(struct gmesh *mesh) continue; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { + type = NULL; + LIST_FOREACH(gc, &pp->lg_config, lg_config) + if (strcmp(gc->lg_name, "type") == 0) + type = gc->lg_val; + + /* Skip swap-backed md devices */ + if (strcmp(classp->lg_name, "MD") == 0 && + type != NULL && strcmp(type, "swap") == 0) + continue; + disks = realloc(disks, (++n)*sizeof(disks[0])); disks[n-1].name = pp->lg_name; humanize_number(diskdesc, 7, pp->lg_mediasize, Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/partedit.c Sun Jan 23 22:39:31 2011 (r217763) +++ user/nwhitehorn/bsdinstall/partedit/partedit.c Sun Jan 23 23:06:15 2011 (r217764) @@ -294,7 +294,7 @@ read_geom_mesh(struct gmesh *mesh, int * items = NULL; /* - * Built the device table. First add all disks (and CDs). + * Build the device table. First add all disks (and CDs). */ LIST_FOREACH(classp, &mesh->lg_class, lg_class) { @@ -346,6 +346,12 @@ add_geom_children(struct ggeom *gp, int if (strcmp(gc->lg_name, "type") == 0) (*items)[*nitems].type = gc->lg_val; } + + /* Skip swap-backed MD devices */ + if (strcmp(gp->lg_class->lg_name, "MD") == 0 && + strcmp((*items)[*nitems].type, "swap") == 0) + continue; + (*nitems)++; LIST_FOREACH(cp, &pp->lg_consumers, lg_consumers) From owner-svn-src-user@FreeBSD.ORG Sun Jan 23 23:17:37 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 A3D1C1065672; Sun, 23 Jan 2011 23:17:37 +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 936EA8FC08; Sun, 23 Jan 2011 23:17:37 +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 p0NNHbUP070596; Sun, 23 Jan 2011 23:17:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NNHbT1070594; Sun, 23 Jan 2011 23:17:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101232317.p0NNHbT1070594@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 23 Jan 2011 23:17:37 +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: r217765 - user/nwhitehorn/bsdinstall 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: Sun, 23 Jan 2011 23:17:37 -0000 Author: nwhitehorn Date: Sun Jan 23 23:17:37 2011 New Revision: 217765 URL: http://svn.freebsd.org/changeset/base/217765 Log: Missed a commit. distribution.tgz is no longer generated, so don't try to install it. Modified: user/nwhitehorn/bsdinstall/bsdinstall Modified: user/nwhitehorn/bsdinstall/bsdinstall ============================================================================== --- user/nwhitehorn/bsdinstall/bsdinstall Sun Jan 23 23:06:15 2011 (r217764) +++ user/nwhitehorn/bsdinstall/bsdinstall Sun Jan 23 23:17:37 2011 (r217765) @@ -1,6 +1,6 @@ #!/bin/sh -[ -z "$DISTRIBUTIONS" ] && export DISTRIBUTIONS="kernel.tgz world.tgz distribution.tgz" +[ -z "$DISTRIBUTIONS" ] && export DISTRIBUTIONS="kernel.tgz world.tgz" [ -z "$BSDINSTALL_LOG" ] && export BSDINSTALL_LOG="/tmp/bsdinstall_log" [ -z "$BSDINSTALL_TMPETC" ] && export BSDINSTALL_TMPETC="/tmp/bsdinstall_etc" [ -z "$PATH_FSTAB" ] && export PATH_FSTAB="$BSDINSTALL_TMPETC/fstab" From owner-svn-src-user@FreeBSD.ORG Mon Jan 24 14:01:31 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 444721065672; Mon, 24 Jan 2011 14:01:31 +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 33D1A8FC1A; Mon, 24 Jan 2011 14:01:31 +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 p0OE1VrM092676; Mon, 24 Jan 2011 14:01:31 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OE1VjP092674; Mon, 24 Jan 2011 14:01:31 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101241401.p0OE1VjP092674@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 24 Jan 2011 14:01:31 +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: r217779 - 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: Mon, 24 Jan 2011 14:01:31 -0000 Author: nwhitehorn Date: Mon Jan 24 14:01:30 2011 New Revision: 217779 URL: http://svn.freebsd.org/changeset/base/217779 Log: Explain what to do at the shell. Submitted by: rwatson Modified: user/nwhitehorn/bsdinstall/release/rc.local Modified: user/nwhitehorn/bsdinstall/release/rc.local ============================================================================== --- user/nwhitehorn/bsdinstall/release/rc.local Mon Jan 24 13:51:59 2011 (r217778) +++ user/nwhitehorn/bsdinstall/release/rc.local Mon Jan 24 14:01:30 2011 (r217779) @@ -23,6 +23,8 @@ $DIALOG_CANCEL) # Live CD exit 0 ;; $DIALOG_EXTRA) # Shell + clear + echo "When fixed, type 'exit' to return to the installer." /bin/sh . /etc/rc.local ;; From owner-svn-src-user@FreeBSD.ORG Mon Jan 24 14:53:53 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 8A858106566C; Mon, 24 Jan 2011 14:53:53 +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 79B8C8FC0A; Mon, 24 Jan 2011 14:53:53 +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 p0OErruN094110; Mon, 24 Jan 2011 14:53:53 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OErrM8094108; Mon, 24 Jan 2011 14:53:53 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101241453.p0OErrM8094108@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 24 Jan 2011 14:53:53 +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: r217783 - user/nwhitehorn/bsdinstall/partedit 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: Mon, 24 Jan 2011 14:53:53 -0000 Author: nwhitehorn Date: Mon Jan 24 14:53:53 2011 New Revision: 217783 URL: http://svn.freebsd.org/changeset/base/217783 Log: Skip WORM media (e.g. CD-ROMs) in the partition editor list. There will be a subsequent change to automatically set up mount points for these devices. Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/partedit.c Mon Jan 24 14:53:10 2011 (r217782) +++ user/nwhitehorn/bsdinstall/partedit/partedit.c Mon Jan 24 14:53:53 2011 (r217783) @@ -299,7 +299,6 @@ read_geom_mesh(struct gmesh *mesh, int * LIST_FOREACH(classp, &mesh->lg_class, lg_class) { if (strcmp(classp->lg_name, "DISK") != 0 && - strcmp(classp->lg_name, "ACD") != 0 && strcmp(classp->lg_name, "MD") != 0) continue; @@ -333,6 +332,10 @@ add_geom_children(struct ggeom *gp, int if (strcmp(gp->lg_class->lg_name, "LABEL") == 0) continue; + /* Skip WORM media */ + if (strncmp(pp->lg_name, "cd", 2) == 0) + continue; + *items = realloc(*items, (*nitems+1)*sizeof(struct partedit_item)); (*items)[*nitems].indentation = recurse; From owner-svn-src-user@FreeBSD.ORG Mon Jan 24 15:05:58 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 6C521106566C; Mon, 24 Jan 2011 15:05:58 +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 4120C8FC1A; Mon, 24 Jan 2011 15:05:58 +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 p0OF5wVo094537; Mon, 24 Jan 2011 15:05:58 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OF5w00094534; Mon, 24 Jan 2011 15:05:58 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101241505.p0OF5w00094534@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 24 Jan 2011 15:05:58 +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: r217785 - user/nwhitehorn/bsdinstall/partedit 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: Mon, 24 Jan 2011 15:05:58 -0000 Author: nwhitehorn Date: Mon Jan 24 15:05:57 2011 New Revision: 217785 URL: http://svn.freebsd.org/changeset/base/217785 Log: Provide a new "Auto" button to invoke the auto-partitioner. Modified: user/nwhitehorn/bsdinstall/partedit/diskeditor.c user/nwhitehorn/bsdinstall/partedit/partedit.c Modified: user/nwhitehorn/bsdinstall/partedit/diskeditor.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/diskeditor.c Mon Jan 24 15:04:15 2011 (r217784) +++ user/nwhitehorn/bsdinstall/partedit/diskeditor.c Mon Jan 24 15:05:57 2011 (r217785) @@ -37,7 +37,7 @@ diskeditor_show(const char *title, const WINDOW *dialog, *partitions; char *prompt; const char *buttons[] = - { "Create", "Delete", "Edit", "Revert", "Finished", NULL }; + { "Create", "Delete", "Modify", "Revert", "Auto", "Exit", NULL }; int x, y; int i; int height, width, min_width; Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/partedit.c Mon Jan 24 15:04:15 2011 (r217784) +++ user/nwhitehorn/bsdinstall/partedit/partedit.c Mon Jan 24 15:05:57 2011 (r217785) @@ -43,11 +43,11 @@ main(int argc, const char **argv) { if (strcmp(basename(argv[0]), "autopart") == 0) { /* Guided */ prompt = "Please review the disk setup. When complete, press " - "the Finished button."; + "the Exit button."; part_wizard(); } else { prompt = "Create partitions for FreeBSD. No changes will be " - "made until you select Finished."; + "made until you select Exit."; } /* Show the part editor either immediately, or to confirm wizard */ @@ -71,7 +71,7 @@ main(int argc, const char **argv) { case 1: /* Delete */ gpart_delete((struct gprovider *)(items[i].cookie)); break; - case 2: /* Edit */ + case 2: /* Modify */ gpart_edit((struct gprovider *)(items[i].cookie)); break; case 3: /* Revert */ @@ -94,10 +94,13 @@ main(int argc, const char **argv) { } init_fstab_metadata(); break; + case 4: /* Auto */ + part_wizard(); + break; } error = 0; - if (op == 4 && validate_setup()) { /* Finished */ + if (op == 5 && validate_setup()) { /* Finished */ dialog_vars.extra_button = TRUE; dialog_vars.extra_label = __DECONST(char *, "Abort"); From owner-svn-src-user@FreeBSD.ORG Mon Jan 24 18:24:28 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 8F3FA106566B; Mon, 24 Jan 2011 18:24:28 +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 7E7018FC08; Mon, 24 Jan 2011 18:24:28 +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 p0OIOS4Q002014; Mon, 24 Jan 2011 18:24:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OIOS1I002012; Mon, 24 Jan 2011 18:24:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101241824.p0OIOS1I002012@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 24 Jan 2011 18:24:28 +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: r217799 - user/nwhitehorn/bsdinstall/partedit 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: Mon, 24 Jan 2011 18:24:28 -0000 Author: nwhitehorn Date: Mon Jan 24 18:24:28 2011 New Revision: 217799 URL: http://svn.freebsd.org/changeset/base/217799 Log: Warn the user if they choose to keep the existing partitioning, but the selected disk is unbootable on this platform. Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/part_wizard.c Mon Jan 24 18:11:37 2011 (r217798) +++ user/nwhitehorn/bsdinstall/partedit/part_wizard.c Mon Jan 24 18:24:28 2011 (r217799) @@ -201,6 +201,24 @@ query: dialog_vars.no_label = NULL; dialog_vars.defaultno = FALSE; + if (choice == 1 && scheme != NULL && !is_scheme_bootable(scheme)) { + char warning[512]; + int subchoice; + + sprintf(warning, "The existing partition scheme on this " + "disk (%s) is not bootable on this platform. To install " + "FreeBSD, it must be repartitioned. This will destroy all " + "data on the disk. Are you sure you want to proceed?", + scheme); + subchoice = dialog_yesno("Non-bootable Disk", warning, 0, 0); + if (subchoice != 0) + goto query; + + gpart_destroy(gpart, 1); + gpart_partition(disk, default_scheme()); + scheme = default_scheme(); + } + if (scheme == NULL || strcmp(scheme, "(none)") == 0 || choice == 0) { if (gpart != NULL) { /* Erase partitioned disk */ choice = dialog_yesno("Confirmation", "This will erase " From owner-svn-src-user@FreeBSD.ORG Mon Jan 24 20:07:15 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 21663106566B; Mon, 24 Jan 2011 20:07:15 +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 1087C8FC15; Mon, 24 Jan 2011 20:07:15 +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 p0OK7EQA004818; Mon, 24 Jan 2011 20:07:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OK7Esu004816; Mon, 24 Jan 2011 20:07:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101242007.p0OK7Esu004816@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 24 Jan 2011 20:07:14 +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: r217801 - 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: Mon, 24 Jan 2011 20:07:15 -0000 Author: nwhitehorn Date: Mon Jan 24 20:07:14 2011 New Revision: 217801 URL: http://svn.freebsd.org/changeset/base/217801 Log: Fix spelling error. Modified: user/nwhitehorn/bsdinstall/release/rc.local Modified: user/nwhitehorn/bsdinstall/release/rc.local ============================================================================== --- user/nwhitehorn/bsdinstall/release/rc.local Mon Jan 24 18:34:16 2011 (r217800) +++ user/nwhitehorn/bsdinstall/release/rc.local Mon Jan 24 20:07:14 2011 (r217801) @@ -24,7 +24,7 @@ $DIALOG_CANCEL) # Live CD ;; $DIALOG_EXTRA) # Shell clear - echo "When fixed, type 'exit' to return to the installer." + echo "When finished, type 'exit' to return to the installer." /bin/sh . /etc/rc.local ;; From owner-svn-src-user@FreeBSD.ORG Tue Jan 25 01:26:25 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 C42581065670; Tue, 25 Jan 2011 01:26:25 +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 B3B5F8FC20; Tue, 25 Jan 2011 01:26:25 +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 p0P1QPKw012978; Tue, 25 Jan 2011 01:26:25 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0P1QPrJ012976; Tue, 25 Jan 2011 01:26:25 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101250126.p0P1QPrJ012976@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 25 Jan 2011 01:26:25 +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: r217807 - 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: Tue, 25 Jan 2011 01:26:25 -0000 Author: nwhitehorn Date: Tue Jan 25 01:26:25 2011 New Revision: 217807 URL: http://svn.freebsd.org/changeset/base/217807 Log: Make room on install CDs by jettisoning kernel symbols. This save 200 MB of space for amd64. Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh ============================================================================== --- user/nwhitehorn/bsdinstall/release/testsystem.sh Mon Jan 24 23:08:38 2011 (r217806) +++ user/nwhitehorn/bsdinstall/release/testsystem.sh Tue Jan 25 01:26:25 2011 (r217807) @@ -32,6 +32,7 @@ tar cvzf $2/world.tgz . # Make system cd /usr/src make installkernel DESTDIR=$1 +rm $1/boot/kernel/*.symbols # Kernel symbols bloat the live CD mkdir $1/usr/bsdinstall-dist cp $2/kernel.tgz $2/world.tgz $1/usr/bsdinstall-dist From owner-svn-src-user@FreeBSD.ORG Fri Jan 28 14:47:09 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 CBDB2106570D; Fri, 28 Jan 2011 14:47:09 +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 AC3A98FC1B; Fri, 28 Jan 2011 14:47:09 +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 p0SEl9D0082879; Fri, 28 Jan 2011 14:47:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0SEl9Jq082874; Fri, 28 Jan 2011 14:47:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101281447.p0SEl9Jq082874@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 28 Jan 2011 14:47:09 +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: r218017 - user/nwhitehorn/bsdinstall/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: Fri, 28 Jan 2011 14:47:10 -0000 Author: nwhitehorn Date: Fri Jan 28 14:47:09 2011 New Revision: 218017 URL: http://svn.freebsd.org/changeset/base/218017 Log: Write rc.conf sections from various configuration steps into separate files and then join them and the end. This will allow the introduction of a 'Back' button or equivalent functionality. Modified: user/nwhitehorn/bsdinstall/scripts/config user/nwhitehorn/bsdinstall/scripts/hostname user/nwhitehorn/bsdinstall/scripts/keymap user/nwhitehorn/bsdinstall/scripts/netconfig user/nwhitehorn/bsdinstall/scripts/services Modified: user/nwhitehorn/bsdinstall/scripts/config ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/config Fri Jan 28 13:48:22 2011 (r218016) +++ user/nwhitehorn/bsdinstall/scripts/config Fri Jan 28 14:47:09 2011 (r218017) @@ -1,3 +1,6 @@ #!/bin/sh +cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf +rm $BSDINSTALL_TMPETC/rc.conf.* + cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc Modified: user/nwhitehorn/bsdinstall/scripts/hostname ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/hostname Fri Jan 28 13:48:22 2011 (r218016) +++ user/nwhitehorn/bsdinstall/scripts/hostname Fri Jan 28 14:47:09 2011 (r218017) @@ -16,7 +16,7 @@ If you are running on a managed network, if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -echo "hostname=\"$HOSTNAME\"" >> $BSDINSTALL_TMPETC/rc.conf +echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then hostname -s "$HOSTNAME" fi Modified: user/nwhitehorn/bsdinstall/scripts/keymap ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/keymap Fri Jan 28 13:48:22 2011 (r218016) +++ user/nwhitehorn/bsdinstall/scripts/keymap Fri Jan 28 14:47:09 2011 (r218017) @@ -2,5 +2,5 @@ kbdcontrol -d >/dev/null 2>&1 if [ $? -eq 0 ]; then - kbdmap 3>&2 2>&1 1>&3 | grep 'keymap=' >> $BSDINSTALL_TMPETC/rc.conf + kbdmap 3>&2 2>&1 1>&3 | grep 'keymap=' > $BSDINSTALL_TMPETC/rc.conf.keymap fi Modified: user/nwhitehorn/bsdinstall/scripts/netconfig ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/netconfig Fri Jan 28 13:48:22 2011 (r218016) +++ user/nwhitehorn/bsdinstall/scripts/netconfig Fri Jan 28 14:47:09 2011 (r218017) @@ -10,6 +10,8 @@ DIALOG_TAGS="" : ${DIALOG_ITEM_HELP=4} : ${DIALOG_ESC=255} +echo -n > $BSDINSTALL_TMPETC/rc.conf.net + for IF in `ifconfig -l`; do if [ $IF != "lo0" ]; then INTERFACES="$INTERFACES $IF" @@ -25,7 +27,7 @@ exec 3>&- dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0 if [ $? -eq $DIALOG_OK ]; then - echo ifconfig_$INTERFACE=\"DHCP\" >> $BSDINSTALL_TMPETC/rc.conf + echo ifconfig_$INTERFACE=\"DHCP\" >> $BSDINSTALL_TMPETC/rc.conf.net if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0 @@ -58,10 +60,10 @@ echo $INTERFACE $IF_CONFIG | awk '{ printf("ifconfig_%s=\"%s netmask %s\"\n", $1, $2, $3); printf("defaultrouter=\"%s\"\n", $4); - }' >> $BSDINSTALL_TMPETC/rc.conf + }' >> $BSDINSTALL_TMPETC/rc.conf.net if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then - . $BSDINSTALL_TMPETC/rc.conf + . $BSDINSTALL_TMPETC/rc.conf.net ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE` route delete default route add default $defaultrouter Modified: user/nwhitehorn/bsdinstall/scripts/services ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/services Fri Jan 28 13:48:22 2011 (r218016) +++ user/nwhitehorn/bsdinstall/scripts/services Fri Jan 28 14:47:09 2011 (r218017) @@ -12,6 +12,6 @@ DAEMONS=$(dialog --backtitle "FreeBSD In exec 3>&- for daemon in $DAEMONS; do - echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf + echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services done From owner-svn-src-user@FreeBSD.ORG Fri Jan 28 15:25:47 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 483671065672; Fri, 28 Jan 2011 15:25:47 +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 385068FC15; Fri, 28 Jan 2011 15:25:47 +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 p0SFPk1Z084755; Fri, 28 Jan 2011 15:25:47 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0SFPk1k084751; Fri, 28 Jan 2011 15:25:46 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101281525.p0SFPk1k084751@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 28 Jan 2011 15:25:46 +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: r218018 - user/nwhitehorn/bsdinstall/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: Fri, 28 Jan 2011 15:25:47 -0000 Author: nwhitehorn Date: Fri Jan 28 15:25:46 2011 New Revision: 218018 URL: http://svn.freebsd.org/changeset/base/218018 Log: Allow use to revisit configuration choices and have a chroot shell in their shiny new system before rebooting. Modified: user/nwhitehorn/bsdinstall/scripts/adduser user/nwhitehorn/bsdinstall/scripts/auto user/nwhitehorn/bsdinstall/scripts/jail Modified: user/nwhitehorn/bsdinstall/scripts/adduser ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/adduser Fri Jan 28 14:47:09 2011 (r218017) +++ user/nwhitehorn/bsdinstall/scripts/adduser Fri Jan 28 15:25:46 2011 (r218018) @@ -1,13 +1,8 @@ #!/bin/sh -dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ - "Would you like to add users to the installed system now?" 0 0 - -if [ $? -eq 0 ]; then - clear - echo "FreeBSD Installer" - echo "========================" - echo "Add Users" - echo - chroot $BSDINSTALL_CHROOT adduser -fi +clear +echo "FreeBSD Installer" +echo "========================" +echo "Add Users" +echo +chroot $BSDINSTALL_CHROOT adduser Modified: user/nwhitehorn/bsdinstall/scripts/auto ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Fri Jan 28 14:47:09 2011 (r218017) +++ user/nwhitehorn/bsdinstall/scripts/auto Fri Jan 28 15:25:46 2011 (r218018) @@ -93,7 +93,67 @@ if [ "$NETCONFIG_DONE" != yes ]; then fi bsdinstall time bsdinstall services -bsdinstall adduser + +dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ + "Would you like to add users to the installed system now?" 0 0 && \ + bsdinstall adduser + +finalconfig() { + exec 3>&1 + REVISIT=$(dialog --backtitle "FreeBSD Installer" \ + --title "Final Configuration" --no-cancel --menu \ + "Setup of your FreeBSD system is nearly complete. You can now \ + modify your configuration choices or apply more complex changes \ + using a shell." 0 0 0 \ + "Add User" "Add a user to the system" \ + "Root Password" "Change root password" \ + "Hostname" "Set system hostname" \ + "Network" "Networking configuration" \ + "Services" "Set daemons to run on startup" \ + "Time Zone" "Set system timezone" \ + "Shell" "Open a shell in the new system" \ + "Reboot" "Apply configuration and reboot" 2>&1 1>&3) + exec 3>&- + + case "$REVISIT" in + "Add User") + bsdinstall adduser + finalconfig + ;; + "Root Password") + bsdinstall rootpass + finalconfig + ;; + "Hostname") + bsdinstall hostname + finalconfig + ;; + "Network") + bsdinstall netconfig + finalconfig + ;; + "Services") + bsdinstall services + finalconfig + ;; + "Time Zone") + bsdinstall time + finalconfig + ;; + "Shell") + clear + echo This shell is operating in a chroot in the new system. \ + When finished making configuration changes, type \"exit\". + chroot "$BSDINSTALL_CHROOT" /bin/sh + # Don't hose local rc.conf changes + cp $BSDINSTALL_CHROOT/etc/rc.conf $BSDINSTALL_TMPETC/rc.conf.manual + finalconfig + ;; + esac +} + +# Allow user to change his mind +finalconfig trap error SIGINT # SIGINT is bad again bsdinstall config || error Modified: user/nwhitehorn/bsdinstall/scripts/jail ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/jail Fri Jan 28 14:47:09 2011 (r218017) +++ user/nwhitehorn/bsdinstall/scripts/jail Fri Jan 28 15:25:46 2011 (r218018) @@ -43,7 +43,10 @@ bsdinstall rootpass || error trap true SIGINT # This section is optional bsdinstall time bsdinstall services -bsdinstall adduser + +dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ + "Would you like to add users to the installed system now?" 0 0 && \ + bsdinstall adduser trap error SIGINT # SIGINT is bad again bsdinstall config || error From owner-svn-src-user@FreeBSD.ORG Fri Jan 28 15:33:00 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 893EB106566C; Fri, 28 Jan 2011 15:33:00 +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 793368FC15; Fri, 28 Jan 2011 15:33:00 +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 p0SFX0uP085012; Fri, 28 Jan 2011 15:33:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0SFX0RQ085011; Fri, 28 Jan 2011 15:33:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101281533.p0SFX0RQ085011@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 28 Jan 2011 15:33:00 +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: r218020 - user/nwhitehorn/bsdinstall/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: Fri, 28 Jan 2011 15:33:00 -0000 Author: nwhitehorn Date: Fri Jan 28 15:32:59 2011 New Revision: 218020 URL: http://svn.freebsd.org/changeset/base/218020 Log: Prettify rendering of this prompt in the dialog. Modified: user/nwhitehorn/bsdinstall/scripts/auto Modified: user/nwhitehorn/bsdinstall/scripts/auto ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Fri Jan 28 15:29:35 2011 (r218019) +++ user/nwhitehorn/bsdinstall/scripts/auto Fri Jan 28 15:32:59 2011 (r218020) @@ -102,9 +102,7 @@ finalconfig() { exec 3>&1 REVISIT=$(dialog --backtitle "FreeBSD Installer" \ --title "Final Configuration" --no-cancel --menu \ - "Setup of your FreeBSD system is nearly complete. You can now \ - modify your configuration choices or apply more complex changes \ - using a shell." 0 0 0 \ + "Setup of your FreeBSD system is nearly complete. You can now modify your configuration choices or apply more complex changes using a shell." 0 0 0 \ "Add User" "Add a user to the system" \ "Root Password" "Change root password" \ "Hostname" "Set system hostname" \ From owner-svn-src-user@FreeBSD.ORG Fri Jan 28 16:09:57 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 EF3F41065674; Fri, 28 Jan 2011 16:09:57 +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 DEBA58FC17; Fri, 28 Jan 2011 16:09:57 +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 p0SG9vj7086162; Fri, 28 Jan 2011 16:09:57 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0SG9vOP086160; Fri, 28 Jan 2011 16:09:57 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101281609.p0SG9vOP086160@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 28 Jan 2011 16:09:57 +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: r218021 - user/nwhitehorn/bsdinstall/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: Fri, 28 Jan 2011 16:09:58 -0000 Author: nwhitehorn Date: Fri Jan 28 16:09:57 2011 New Revision: 218021 URL: http://svn.freebsd.org/changeset/base/218021 Log: Truncate rc.conf.services at start to avoid duplicate entries. Modified: user/nwhitehorn/bsdinstall/scripts/services Modified: user/nwhitehorn/bsdinstall/scripts/services ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/services Fri Jan 28 15:32:59 2011 (r218020) +++ user/nwhitehorn/bsdinstall/scripts/services Fri Jan 28 16:09:57 2011 (r218021) @@ -1,5 +1,7 @@ #!/bin/sh +echo -n > $BSDINSTALL_TMPETC/rc.conf.services + exec 3>&1 DAEMONS=$(dialog --backtitle "FreeBSD Installer" \ --title "System Configuration" --nocancel --separate-output \ From owner-svn-src-user@FreeBSD.ORG Fri Jan 28 16:20:16 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 3E0FB1065670; Fri, 28 Jan 2011 16:20:16 +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 2E2728FC1A; Fri, 28 Jan 2011 16:20:16 +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 p0SGKGEt086696; Fri, 28 Jan 2011 16:20:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0SGKGaZ086695; Fri, 28 Jan 2011 16:20:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101281620.p0SGKGaZ086695@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 28 Jan 2011 16:20:16 +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: r218022 - user/nwhitehorn/bsdinstall/partedit 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, 28 Jan 2011 16:20:16 -0000 Author: nwhitehorn Date: Fri Jan 28 16:20:15 2011 New Revision: 218022 URL: http://svn.freebsd.org/changeset/base/218022 Log: Add a generic partedit platform module as a fallback. This is meant for embedded platforms like MIPS and ARM so that partedit can still build. For lack of better information, it is programmed to trust the user's choices choice and never to suggest anything. Added: user/nwhitehorn/bsdinstall/partedit/partedit_generic.c Added: user/nwhitehorn/bsdinstall/partedit/partedit_generic.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/partedit/partedit_generic.c Fri Jan 28 16:20:15 2011 (r218022) @@ -0,0 +1,41 @@ +#include + +#include "partedit.h" + +const char * +default_scheme(void) { + /* + * Our loader can parse GPT, so pick that as the default for lack of + * a better idea. + */ + + return ("GPT"); +} + +int +is_scheme_bootable(const char *part_type) { + /* + * We don't know anything about this platform, so don't irritate the + * user by claiming the chosen partition scheme isn't bootable. + */ + + return (1); +} + +/* No clue => no boot partition, bootcode, or partcode */ + +size_t +bootpart_size(const char *part_type) { + return (0); +} + +const char * +bootcode_path(const char *part_type) { + return (NULL); +} + +const char * +partcode_path(const char *part_type) { + return (NULL); +} +