From owner-svn-src-user@FreeBSD.ORG Sat Sep 13 06:51:20 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2904521B; Sat, 13 Sep 2014 06:51:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE82D3C4; Sat, 13 Sep 2014 06:51:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8D6pJVt035450; Sat, 13 Sep 2014 06:51:19 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8D6pJ7t035445; Sat, 13 Sep 2014 06:51:19 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201409130651.s8D6pJ7t035445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sat, 13 Sep 2014 06:51:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r271502 - user/nwhitehorn/bsdinstall_zfspartedit/partedit X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 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, 13 Sep 2014 06:51:20 -0000 Author: nwhitehorn Date: Sat Sep 13 06:51:19 2014 New Revision: 271502 URL: http://svnweb.freebsd.org/changeset/base/271502 Log: Reduce diffs to head. Modified: user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h Modified: user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c Sat Sep 13 06:45:04 2014 (r271501) +++ user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c Sat Sep 13 06:51:19 2014 (r271502) @@ -584,8 +584,8 @@ editpart: newfs_command(items[0].text, newfs, 1); set_default_part_metadata(pp->lg_name, scheme, items[0].text, - items[2].text, - (strcmp(oldtype, items[0].text) != 0) ? newfs : NULL); + items[2].text, (strcmp(oldtype, items[0].text) != 0) ? + newfs : NULL); endedit: if (strcmp(oldtype, items[0].text) != 0 && cp != NULL) Modified: user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c ============================================================================== --- user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c Sat Sep 13 06:45:04 2014 (r271501) +++ user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c Sat Sep 13 06:51:19 2014 (r271502) @@ -377,10 +377,10 @@ apply_changes(struct gmesh *mesh) dialog_msgbox("Error", message, 0, 0, TRUE); return (-1); } - fprintf(fstab, "# Device\t\tMountpoint\tFStype\tOptions\t\tDump\tPass#\n"); + fprintf(fstab, "# Device\tMountpoint\tFStype\tOptions\tDump\tPass#\n"); TAILQ_FOREACH(md, &part_metadata, metadata) { if (md->fstab != NULL) - fprintf(fstab, "%s\t\t%s\t\t%s\t%s\t\t%d\t%d\n", + fprintf(fstab, "%s\t%s\t\t%s\t%s\t%d\t%d\n", md->fstab->fs_spec, md->fstab->fs_file, md->fstab->fs_vfstype, md->fstab->fs_mntops, md->fstab->fs_freq, md->fstab->fs_passno); @@ -499,7 +499,6 @@ init_fstab_metadata(void) md->fstab->fs_passno = fstab->fs_passno; md->newfs = NULL; - md->poolname = NULL; TAILQ_INSERT_TAIL(&part_metadata, md, metadata); } Modified: user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h ============================================================================== --- user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h Sat Sep 13 06:45:04 2014 (r271501) +++ user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h Sat Sep 13 06:51:19 2014 (r271502) @@ -45,7 +45,6 @@ struct partition_metadata { struct fstab *fstab; /* fstab data for this partition */ char *newfs; /* shell command to initialize partition */ - char *poolname; /* ZFS pool name */ int bootcode;