From nobody@FreeBSD.org  Sun Jun 24 00:10:32 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 038C416A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 24 Jun 2007 00:10:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id D310313C468
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 24 Jun 2007 00:10:31 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l5O0AVad024110
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 24 Jun 2007 00:10:31 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l5O0AV3r024109;
	Sun, 24 Jun 2007 00:10:31 GMT
	(envelope-from nobody)
Message-Id: <200706240010.l5O0AV3r024109@www.freebsd.org>
Date: Sun, 24 Jun 2007 00:10:31 GMT
From: David Sanderson <dsanderson@panasas.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: sysinstall does not support UFS1 filesystems in install.cfg
X-Send-Pr-Version: www-3.0

>Number:         113979
>Category:       bin
>Synopsis:       [patch] sysinstall(8) does not support UFS1 filesystems in install.cfg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brucec
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 24 00:20:00 GMT 2007
>Closed-Date:    Tue Feb 22 17:53:13 UTC 2011
>Last-Modified:  Tue Feb 22 18:00:31 UTC 2011
>Originator:     David Sanderson
>Release:        FreeBSD 6.2
>Organization:
Panasas, Inc.
>Environment:
FreeBSD perf-x4 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 08:43:30 UTC 2007     root@portnoy.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP  amd64
>Description:
The FreeBSD 6.2 sysinstall supports creating UFS1 or UFS2 filesystems when used interactively, but only supports UFS2 filesystems via a noninteractive install via install.cfg.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Change 210521 by dsanderson@dsanderson-k2-sb7-tango-bsd-dws2 on 2007/06/23 19:10:32

	Teach the FreeBSD 6 sysinstall how to create a UFS1 filesystem
	via install.cfg.
	
	The default is still UFS2.  To select UFS1, use "ufs1" as the
	filesystem type in the label arguments.
	
	Tested with an install.cfg fragment like so:
	
	    # root, 8 GB
	    twed0s1-1=ufs1 16777216 /
	    # swap, 8 GB
	    twed0s1-2=swap 16777216 none
	    # /var, rest of the disk
	    twed0s1-4=ufs1        0 /var
	    # now invoke the label editor
	    diskLabelEditor
	
	To see whether a filesystem is UFS1 or UFS2, you can use dumpfs.
	For instance,
	
	    11826358700000# dumpfs / | sed 1q
	    magic   11954 (UFS1)    time    Sat Jun 23 23:06:41 2007
	
Affected files ...

.. //depot/branch/tango-bsd-dws/src/freebsd6/src/usr.sbin/sysinstall/label.c#2 edit

Differences ...

==== //depot/branch/tango-bsd-dws/src/freebsd6/src/usr.sbin/sysinstall/label.c#2 (text) ====
Index: branch/tango-bsd-dws/src/freebsd6/src/usr.sbin/sysinstall/label.c
--- branch/tango-bsd-dws/src/freebsd6/src/usr.sbin/sysinstall/label.c.~1~	Sat Jun 23 20:05:33 2007
+++ branch/tango-bsd-dws/src/freebsd6/src/usr.sbin/sysinstall/label.c	Sat Jun 23 20:05:33 2007
@@ -1636,6 +1636,7 @@
 	    for (entries = 1;; entries++) {
 		intmax_t sz;
 		int soft = 0;
+		int ufs1 = 0;
 		snprintf(name, sizeof name, "%s-%d", c1->name, entries);
 		if ((cp = variable_get(name)) == NULL)
 		    break;
@@ -1652,6 +1653,8 @@
 			strcpy(mpoint, "SWAP");
 		    } else {
 			type = PART_FILESYSTEM;
+		        if (!strcmp(typ, "ufs1"))
+			    ufs1 = 1;
 			if (!strcmp(mpoint, "/"))
 			    flags |= CHUNK_IS_ROOT;
 		    }
@@ -1672,6 +1675,7 @@
 			pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE);
 			tmp->private_free = safe_free;
 			pi->newfs_data.newfs_ufs.softupdates = soft;
+	                pi->newfs_data.newfs_ufs.ufs1 = ufs1;
 		    }
 		}
 	    }
End of Patch.


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->matteo 
Responsible-Changed-By: matteo 
Responsible-Changed-When: Lun 4 Feb 2008 21:22:28 UTC 
Responsible-Changed-Why:  
I found the will to work on easy sysinstall PR's 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113979 
Responsible-Changed-From-To: matteo->freebsd-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Jun 19 04:45:10 UTC 2010 
Responsible-Changed-Why:  
Reset PR assigned to inactive committer. 

Hat:	gnats-admin 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113979 
Responsible-Changed-From-To: freebsd-bugs->freebsd-sysinstall 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Tue Jul 13 13:36:56 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer(s) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113979 

From: Devin Teske <dteske@vicor.com>
To: bug-followup@FreeBSD.org, dsanderson@panasas.com
Cc:  
Subject: Re: bin/113979: [patch] sysinstall(8) does not support UFS1
	filesystems in install.cfg
Date: Mon, 01 Nov 2010 08:37:21 -0700

 Here's a cleaner patch (2-lines versus 4), reusing as much of what's
 already available in sysinstall.
 
 --- usr.sbin/sysinstall/label.c.orig    2010-02-19 12:26:30.000000000 -0800
 +++ usr.sbin/sysinstall/label.c 2010-08-03 14:24:43.000000000 -0700
 @@ -1647,6 +1647,8 @@ diskLabelNonInteractive(Device *dev)
                         pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE);
                         tmp->private_free = safe_free;
                         pi->newfs_data.newfs_ufs.softupdates = soft;
 +                       if (!strcmp(typ, "ufs1"))
 +                           pi->newfs_data.newfs_ufs.ufs1 = true;
                     }
                 }
             }
 
 -- 
 Cheers,
 Devin Teske
 
 -> CONTACT INFORMATION <-
 Business Solutions Consultant II
 FIS - fisglobal.com
 510-735-5650 Mobile
 510-621-2038 Office
 510-621-2020 Office Fax
 909-477-4578 Home/Fax
 devin.teske@fisglobal.com
 
 -> LEGAL DISCLAIMER <-
 This message  contains confidential  and proprietary  information
 of the sender,  and is intended only for the person(s) to whom it
 is addressed. Any use, distribution, copying or disclosure by any
 other person  is strictly prohibited.  If you have  received this
 message in error,  please notify  the e-mail sender  immediately,
 and delete the original message without making a copy.
 
 -> FUN STUFF <-
 -----BEGIN GEEK CODE BLOCK-----
 Version 3.1
 GAT/CS d(+) s: a- C++(++++) UB++++$ P++(++++) L++(++++) !E--- W++ N? o? K- w O
 M+ V- PS+ PE Y+ PGP- t(+) 5? X+(++) R>++ tv(+) b+(++) DI+(++) D(+) G+>++ e>+ h
 r>++ y+ 
 ------END GEEK CODE BLOCK------
 http://www.geekcode.com/
 
 -> END TRANSMISSION <-
 
State-Changed-From-To: open->patched 
State-Changed-By: brucec 
State-Changed-When: Sat Feb 19 09:33:57 UTC 2011 
State-Changed-Why:  
Fixed in HEAD. 


Responsible-Changed-From-To: freebsd-sysinstall->brucec 
Responsible-Changed-By: brucec 
Responsible-Changed-When: Sat Feb 19 09:33:57 UTC 2011 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113979 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/113979: commit references a PR
Date: Sat, 19 Feb 2011 09:33:58 +0000 (UTC)

 Author: brucec
 Date: Sat Feb 19 09:33:53 2011
 New Revision: 218841
 URL: http://svn.freebsd.org/changeset/base/218841
 
 Log:
   Allow users to create ufs1 filesystems via the noninteractive install.cfg
   system.
   
   PR:		bin/113979
   MFC after:	3 days
 
 Modified:
   head/usr.sbin/sysinstall/label.c
 
 Modified: head/usr.sbin/sysinstall/label.c
 ==============================================================================
 --- head/usr.sbin/sysinstall/label.c	Sat Feb 19 09:24:24 2011	(r218840)
 +++ head/usr.sbin/sysinstall/label.c	Sat Feb 19 09:33:53 2011	(r218841)
 @@ -1653,6 +1653,8 @@ diskLabelNonInteractive(Device *dev)
  			pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE);
  			tmp->private_free = safe_free;
  			pi->newfs_data.newfs_ufs.softupdates = soft;
 +			if (!strcmp(typ, "ufs1"))
 +				pi->newfs_data.newfs_ufs.ufs1 = TRUE;
  		    }
  		}
  	    }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/113979: commit references a PR
Date: Tue, 22 Feb 2011 17:40:24 +0000 (UTC)

 Author: brucec
 Date: Tue Feb 22 17:40:18 2011
 New Revision: 218954
 URL: http://svn.freebsd.org/changeset/base/218954
 
 Log:
   MFC r218841:
   
   Allow users to create ufs1 filesystems via the noninteractive install.cfg
   system.
   
   PR:           bin/113979
 
 Modified:
   stable/8/usr.sbin/sysinstall/label.c
 Directory Properties:
   stable/8/usr.sbin/sysinstall/   (props changed)
 
 Modified: stable/8/usr.sbin/sysinstall/label.c
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/label.c	Tue Feb 22 17:38:43 2011	(r218953)
 +++ stable/8/usr.sbin/sysinstall/label.c	Tue Feb 22 17:40:18 2011	(r218954)
 @@ -1653,6 +1653,8 @@ diskLabelNonInteractive(Device *dev)
  			pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE);
  			tmp->private_free = safe_free;
  			pi->newfs_data.newfs_ufs.softupdates = soft;
 +			if (!strcmp(typ, "ufs1"))
 +				pi->newfs_data.newfs_ufs.ufs1 = TRUE;
  		    }
  		}
  	    }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brucec 
State-Changed-When: Tue Feb 22 17:52:55 UTC 2011 
State-Changed-Why:  
Merged to stable/7 and stable/8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113979 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/113979: commit references a PR
Date: Tue, 22 Feb 2011 17:50:39 +0000 (UTC)

 Author: brucec
 Date: Tue Feb 22 17:50:33 2011
 New Revision: 218956
 URL: http://svn.freebsd.org/changeset/base/218956
 
 Log:
   MFC r218839, r218840, r218841:
   
   In the distribution list, 'A' is listed as the key to press to select both
   'All' and 'Minimal'. Update the keys for Minimal and Custom to avoid the
   conflict.
   
   Remove the quotas option from the Startup Services menu.
   GENERIC has no support for quotas so this option has no effect.
   
   Allow users to create ufs1 filesystems via the noninteractive install.cfg
   system.
   
   PR:   bin/153809
   PR:   bin/123237
   PR:   bin/113979
 
 Modified:
   stable/7/usr.sbin/sysinstall/label.c
   stable/7/usr.sbin/sysinstall/menus.c
 Directory Properties:
   stable/7/usr.sbin/sysinstall/   (props changed)
 
 Modified: stable/7/usr.sbin/sysinstall/label.c
 ==============================================================================
 --- stable/7/usr.sbin/sysinstall/label.c	Tue Feb 22 17:43:09 2011	(r218955)
 +++ stable/7/usr.sbin/sysinstall/label.c	Tue Feb 22 17:50:33 2011	(r218956)
 @@ -1674,6 +1674,8 @@ diskLabelNonInteractive(Device *dev)
  			pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE);
  			tmp->private_free = safe_free;
  			pi->newfs_data.newfs_ufs.softupdates = soft;
 +			if (!strcmp(typ, "ufs1"))
 +				pi->newfs_data.newfs_ufs.ufs1 = TRUE;
  		    }
  		}
  	    }
 
 Modified: stable/7/usr.sbin/sysinstall/menus.c
 ==============================================================================
 --- stable/7/usr.sbin/sysinstall/menus.c	Tue Feb 22 17:43:09 2011	(r218955)
 +++ stable/7/usr.sbin/sysinstall/menus.c	Tue Feb 22 17:50:33 2011	(r218956)
 @@ -922,9 +922,9 @@ DMenu MenuDistributions = {
  	checkDistUser,		distSetUser },
        { "9 X-User",		"Same as above + X Window System",
  	checkDistXUser,		distSetXUser },
 -      { "A Minimal",		"The smallest configuration possible",
 +      { "B Minimal",		"The smallest configuration possible",
  	checkDistMinimum,	distSetMinimum },
 -      { "B Custom",		"Specify your own distribution set",
 +      { "C Custom",		"Specify your own distribution set",
  	NULL,			dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
        { NULL } },
  };
 @@ -1263,8 +1263,6 @@ DMenu MenuStartup = {
        { " OSF/1",	"This host wants to be able to run DEC OSF/1 binaries.",
  	dmenuVarCheck, configOSF1, NULL, VAR_OSF1_ENABLE "=YES" },
  #endif
 -      { " quotas",	"This host wishes to check quotas on startup.",
 -	dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" },
        { NULL } },
  };
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
