From nobody@FreeBSD.org  Wed Sep 22 18:12:56 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9FE0910656A4
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 22 Sep 2010 18:12:56 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 84F978FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 22 Sep 2010 18:12:56 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o8MICuIQ073909
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 22 Sep 2010 18:12:56 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o8MICud9073908;
	Wed, 22 Sep 2010 18:12:56 GMT
	(envelope-from nobody)
Message-Id: <201009221812.o8MICud9073908@www.freebsd.org>
Date: Wed, 22 Sep 2010 18:12:56 GMT
From: Kris Moore <kmoore@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: src: usr.sbin/pc-sysinstall - Add support for SoftUpdates Journaling
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         150862
>Category:       bin
>Synopsis:       [patch] pc-sysinstall(8) - Add support for SoftUpdates Journaling
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    imp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 22 18:20:01 UTC 2010
>Closed-Date:    Sat Oct 09 01:48:56 MDT 2010
>Last-Modified:  Sat Oct  9 07:50:01 UTC 2010
>Originator:     Kris Moore
>Release:        9.0-Current
>Organization:
iXsystems
>Environment:
9.0-Current
>Description:
The following patch enables support for the recent SoftUpdates + Journaling which is in HEAD. This patch allows pc-sysinstall users to use this as a valid file-system choice during install time. 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN src.o/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh src/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
--- src.o/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	2010-09-22 08:50:07.000000000 -0400
+++ src/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	2010-09-22 08:55:33.000000000 -0400
@@ -217,7 +217,7 @@
           
       # Now check that these values are sane
       case $FS in
-        UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
+        UFS|UFS+S|UFS+J||UFS+SUJ|ZFS|SWAP) ;;
        *) exit_err "ERROR: Invalid file system specified on $line" ;;
       esac
 
@@ -261,7 +261,7 @@
         check_for_mount "${MNT}" "/boot"
         if [ "${?}" = "0" ] ; then
           USINGBOOTPART="0" ; export USINGBOOTPART
-          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
+          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ]
           then
             exit_err "/boot partition must be formatted with UFS"
           fi
@@ -401,7 +401,7 @@
           
       # Now check that these values are sane
       case $FS in
-        UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
+        UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
        *) exit_err "ERROR: Invalid file system specified on $line" ;;
       esac
 
@@ -438,7 +438,7 @@
       if [ "${?}" = "0" ] ; then
         if [ "${CURPART}" = "2" ] ; then
           USINGBOOTPART="0" ; export USINGBOOTPART
-          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
+          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ]
           then
             exit_err "/boot partition must be formatted with UFS"
           fi
diff -ruN src.o/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh src/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
--- src.o/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	2010-09-22 08:50:07.000000000 -0400
+++ src/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	2010-09-22 08:58:06.000000000 -0400
@@ -124,6 +124,7 @@
       case ${PARTFS} in
         UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
         UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
+        UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
         UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} "async,noatime" ;;
         ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
         *) exit_err "ERROR: Got unknown file-system type $PARTFS" ;;
@@ -158,6 +159,7 @@
        case ${PARTFS} in
          UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
          UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
+         UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
          UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} "async,noatime" ;;
          ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
          SWAP)
diff -ruN src.o/usr.sbin/pc-sysinstall/backend/functions-newfs.sh src/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
--- src.o/usr.sbin/pc-sysinstall/backend/functions-newfs.sh	2010-09-22 08:50:07.000000000 -0400
+++ src/usr.sbin/pc-sysinstall/backend/functions-newfs.sh	2010-09-22 09:00:14.000000000 -0400
@@ -154,6 +154,25 @@
         sleep 2
         ;;
 
+      UFS+SUJ)
+        echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
+        sleep 2
+        rc_halt "newfs -U /dev/${PART}${EXT}"
+        sleep 2
+        rc_halt "sync"
+        rc_halt "tunefs -j enable /dev/${PART}${EXT}"
+        sleep 2
+        rc_halt "sync"
+        rc_halt "glabel label ${PARTLABEL} /dev/${PART}${EXT}"
+        rc_halt "sync"
+	    # Set flag that we've found a boot partition
+	    if [ "$PARTMNT" = "/boot" -o "${PARTMNT}" = "/" ] ; then
+          HAVEBOOT="YES"
+        fi
+        sleep 2
+        ;;
+
+
       UFS+J)
         echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
         sleep 2
diff -ruN src.o/usr.sbin/pc-sysinstall/backend/functions-unmount.sh src/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
--- src.o/usr.sbin/pc-sysinstall/backend/functions-unmount.sh	2010-09-22 08:50:07.000000000 -0400
+++ src/usr.sbin/pc-sysinstall/backend/functions-unmount.sh	2010-09-22 08:58:33.000000000 -0400
@@ -99,6 +99,7 @@
         case ${PARTFS} in
           UFS) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
           UFS+S) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
+          UFS+SUJ) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
           UFS+J) glabel label ${PARTLABEL} /dev/${PART}${EXT}.journal ;;
           *) ;;
         esac 
@@ -113,6 +114,7 @@
         case ${PARTFS} in
           UFS) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
           UFS+S) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
+          UFS+SUJ) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
           UFS+J) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}.journal" ;;
           *) ;;
         esac 
diff -ruN src.o/usr.sbin/pc-sysinstall/examples/README src/usr.sbin/pc-sysinstall/examples/README
--- src.o/usr.sbin/pc-sysinstall/examples/README	2010-09-22 08:50:07.000000000 -0400
+++ src/usr.sbin/pc-sysinstall/examples/README	2010-09-22 09:09:28.000000000 -0400
@@ -189,13 +189,14 @@
 Available FileSystems: 
   UFS - Standard UFS2 FileSystem
 UFS+S - UFS2 + Softupdates enabled
+UFS+SUJ - UFS2 + Soft Updates + Journaling enabled
 UFS+J - UFS2 + Journaling through gjournal
   ZFS - Z File System, pools / mounts created automatically
  SWAP - BSD Swap space partition, mountpoint should be set to "none"
 
 Adding the ".eli" extension to any of the above file systems
 will enable disk encryption via geli
-(UFS.eli, UFS+S.eli, UFS+J.eli, ZFS.eli, SWAP.eli)
+(UFS.eli, UFS+S.eli, UFS+SUJ.eli, UFS+J.eli, ZFS.eli, SWAP.eli)
 
 If you with to use a passphrase with this encrypted partition, on the next line
 the flag "encpass=" should be entered:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Sep 27 01:07:02 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer. 

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

From: Kris Moore <krismoore134@gmail.com>
To: bug-followup@FreeBSD.org, kmoore@FreeBSD.org
Cc:  
Subject: Re: bin/150862: [patch] pc-sysinstall(8) - Add support for SoftUpdates
 Journaling
Date: Thu, 30 Sep 2010 14:56:42 -0400

 This is a multi-part message in MIME format.
 --------------020404070203020304010605
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 
 Attached is an updated version of the patch, fixing a stray '|' found in
 testing :P
 
 
 
 -- 
 Kris Moore
 PC-BSD Software / iXSystems
 
 
 --------------020404070203020304010605
 Content-Type: text/plain;
  name="patch-fs-suj-pcsys.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-fs-suj-pcsys.txt"
 
 diff -ruN usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
 --- usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	2010-09-22 08:50:07.000000000 -0400
 +++ usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	2010-09-22 08:55:33.000000000 -0400
 @@ -217,7 +217,7 @@
            
        # Now check that these values are sane
        case $FS in
 -        UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
 +        UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
         *) exit_err "ERROR: Invalid file system specified on $line" ;;
        esac
  
 @@ -261,7 +261,7 @@
          check_for_mount "${MNT}" "/boot"
          if [ "${?}" = "0" ] ; then
            USINGBOOTPART="0" ; export USINGBOOTPART
 -          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
 +          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ]
            then
              exit_err "/boot partition must be formatted with UFS"
            fi
 @@ -401,7 +401,7 @@
            
        # Now check that these values are sane
        case $FS in
 -        UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
 +        UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
         *) exit_err "ERROR: Invalid file system specified on $line" ;;
        esac
  
 @@ -438,7 +438,7 @@
        if [ "${?}" = "0" ] ; then
          if [ "${CURPART}" = "2" ] ; then
            USINGBOOTPART="0" ; export USINGBOOTPART
 -          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
 +          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ]
            then
              exit_err "/boot partition must be formatted with UFS"
            fi
 diff -ruN usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
 --- usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	2010-09-22 08:50:07.000000000 -0400
 +++ usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	2010-09-22 08:58:06.000000000 -0400
 @@ -124,6 +124,7 @@
        case ${PARTFS} in
          UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
          UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
 +        UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
          UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} "async,noatime" ;;
          ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
          *) exit_err "ERROR: Got unknown file-system type $PARTFS" ;;
 @@ -158,6 +159,7 @@
         case ${PARTFS} in
           UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
           UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
 +         UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
           UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} "async,noatime" ;;
           ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
           SWAP)
 diff -ruN usr.sbin/pc-sysinstall/backend/functions-newfs.sh usr.sbin/pc-sysinstall/backend/functions-newfs.sh
 --- usr.sbin/pc-sysinstall/backend/functions-newfs.sh	2010-09-22 08:50:07.000000000 -0400
 +++ usr.sbin/pc-sysinstall/backend/functions-newfs.sh	2010-09-22 09:00:14.000000000 -0400
 @@ -154,6 +154,25 @@
          sleep 2
          ;;
  
 +      UFS+SUJ)
 +        echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
 +        sleep 2
 +        rc_halt "newfs -U /dev/${PART}${EXT}"
 +        sleep 2
 +        rc_halt "sync"
 +        rc_halt "tunefs -j enable /dev/${PART}${EXT}"
 +        sleep 2
 +        rc_halt "sync"
 +        rc_halt "glabel label ${PARTLABEL} /dev/${PART}${EXT}"
 +        rc_halt "sync"
 +	    # Set flag that we've found a boot partition
 +	    if [ "$PARTMNT" = "/boot" -o "${PARTMNT}" = "/" ] ; then
 +          HAVEBOOT="YES"
 +        fi
 +        sleep 2
 +        ;;
 +
 +
        UFS+J)
          echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
          sleep 2
 diff -ruN usr.sbin/pc-sysinstall/backend/functions-unmount.sh usr.sbin/pc-sysinstall/backend/functions-unmount.sh
 --- usr.sbin/pc-sysinstall/backend/functions-unmount.sh	2010-09-22 08:50:07.000000000 -0400
 +++ usr.sbin/pc-sysinstall/backend/functions-unmount.sh	2010-09-22 08:58:33.000000000 -0400
 @@ -99,6 +99,7 @@
          case ${PARTFS} in
            UFS) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
            UFS+S) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
 +          UFS+SUJ) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
            UFS+J) glabel label ${PARTLABEL} /dev/${PART}${EXT}.journal ;;
            *) ;;
          esac 
 @@ -113,6 +114,7 @@
          case ${PARTFS} in
            UFS) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
            UFS+S) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
 +          UFS+SUJ) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
            UFS+J) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}.journal" ;;
            *) ;;
          esac 
 diff -ruN usr.sbin/pc-sysinstall/examples/README usr.sbin/pc-sysinstall/examples/README
 --- usr.sbin/pc-sysinstall/examples/README	2010-09-22 08:50:07.000000000 -0400
 +++ usr.sbin/pc-sysinstall/examples/README	2010-09-22 09:09:28.000000000 -0400
 @@ -189,13 +189,14 @@
  Available FileSystems: 
    UFS - Standard UFS2 FileSystem
  UFS+S - UFS2 + Softupdates enabled
 +UFS+SUJ - UFS2 + Soft Updates + Journaling enabled
  UFS+J - UFS2 + Journaling through gjournal
    ZFS - Z File System, pools / mounts created automatically
   SWAP - BSD Swap space partition, mountpoint should be set to "none"
  
  Adding the ".eli" extension to any of the above file systems
  will enable disk encryption via geli
 -(UFS.eli, UFS+S.eli, UFS+J.eli, ZFS.eli, SWAP.eli)
 +(UFS.eli, UFS+S.eli, UFS+SUJ.eli, UFS+J.eli, ZFS.eli, SWAP.eli)
  
  If you with to use a passphrase with this encrypted partition, on the next line
  the flag "encpass=" should be entered:
 
 --------------020404070203020304010605--
State-Changed-From-To: open->closed 
State-Changed-By: imp 
State-Changed-When: Sat Oct 9 01:48:12 MDT 2010 
State-Changed-Why:  
Committed... 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/150862: commit references a PR
Date: Sat,  9 Oct 2010 07:45:31 +0000 (UTC)

 Author: imp
 Date: Sat Oct  9 07:45:24 2010
 New Revision: 213647
 URL: http://svn.freebsd.org/changeset/base/213647
 
 Log:
   Enable softupdate + journals support.
   
   PR: 150862
   Submitted by: Kris Moore
 
 Modified:
   head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
   head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
   head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
   head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
   head/usr.sbin/pc-sysinstall/examples/README
 
 Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	Sat Oct  9 07:29:13 2010	(r213646)
 +++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	Sat Oct  9 07:45:24 2010	(r213647)
 @@ -217,7 +217,7 @@ setup_mbr_partitions()
            
        # Now check that these values are sane
        case $FS in
 -        UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
 +        UFS|UFS+S|UFS+J||UFS+SUJ|ZFS|SWAP) ;;
         *) exit_err "ERROR: Invalid file system specified on $line" ;;
        esac
  
 @@ -261,7 +261,7 @@ setup_mbr_partitions()
          check_for_mount "${MNT}" "/boot"
          if [ "${?}" = "0" ] ; then
            USINGBOOTPART="0" ; export USINGBOOTPART
 -          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
 +          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ]
            then
              exit_err "/boot partition must be formatted with UFS"
            fi
 @@ -401,7 +401,7 @@ setup_gpt_partitions()
            
        # Now check that these values are sane
        case $FS in
 -        UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
 +        UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
         *) exit_err "ERROR: Invalid file system specified on $line" ;;
        esac
  
 @@ -438,7 +438,7 @@ setup_gpt_partitions()
        if [ "${?}" = "0" ] ; then
          if [ "${CURPART}" = "2" ] ; then
            USINGBOOTPART="0" ; export USINGBOOTPART
 -          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
 +          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ]
            then
              exit_err "/boot partition must be formatted with UFS"
            fi
 
 Modified: head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	Sat Oct  9 07:29:13 2010	(r213646)
 +++ head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	Sat Oct  9 07:45:24 2010	(r213647)
 @@ -124,6 +124,7 @@ mount_all_filesystems()
        case ${PARTFS} in
          UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
          UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
 +        UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
          UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} "async,noatime" ;;
          ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
          *) exit_err "ERROR: Got unknown file-system type $PARTFS" ;;
 @@ -158,6 +159,7 @@ mount_all_filesystems()
         case ${PARTFS} in
           UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
           UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
 +         UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
           UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} "async,noatime" ;;
           ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
           SWAP)
 
 Modified: head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh	Sat Oct  9 07:29:13 2010	(r213646)
 +++ head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh	Sat Oct  9 07:45:24 2010	(r213647)
 @@ -154,6 +154,25 @@ setup_filesystems()
          sleep 2
          ;;
  
 +      UFS+SUJ)
 +        echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
 +        sleep 2
 +        rc_halt "newfs -U /dev/${PART}${EXT}"
 +        sleep 2
 +        rc_halt "sync"
 +        rc_halt "tunefs -j enable /dev/${PART}${EXT}"
 +        sleep 2
 +        rc_halt "sync"
 +        rc_halt "glabel label ${PARTLABEL} /dev/${PART}${EXT}"
 +        rc_halt "sync"
 +	    # Set flag that we've found a boot partition
 +	    if [ "$PARTMNT" = "/boot" -o "${PARTMNT}" = "/" ] ; then
 +          HAVEBOOT="YES"
 +        fi
 +        sleep 2
 +        ;;
 +
 +
        UFS+J)
          echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
          sleep 2
 
 Modified: head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh	Sat Oct  9 07:29:13 2010	(r213646)
 +++ head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh	Sat Oct  9 07:45:24 2010	(r213647)
 @@ -99,6 +99,7 @@ unmount_all_filesystems()
          case ${PARTFS} in
            UFS) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
            UFS+S) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
 +          UFS+SUJ) glabel label ${PARTLABEL} /dev/${PART}${EXT} ;;
            UFS+J) glabel label ${PARTLABEL} /dev/${PART}${EXT}.journal ;;
            *) ;;
          esac 
 @@ -113,6 +114,7 @@ unmount_all_filesystems()
          case ${PARTFS} in
            UFS) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
            UFS+S) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
 +          UFS+SUJ) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}" ;;
            UFS+J) ROOTRELABEL="glabel label ${PARTLABEL} /dev/${PART}${EXT}.journal" ;;
            *) ;;
          esac 
 
 Modified: head/usr.sbin/pc-sysinstall/examples/README
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/examples/README	Sat Oct  9 07:29:13 2010	(r213646)
 +++ head/usr.sbin/pc-sysinstall/examples/README	Sat Oct  9 07:45:24 2010	(r213647)
 @@ -189,13 +189,14 @@ The notation is as follows:
  Available FileSystems: 
    UFS - Standard UFS2 FileSystem
  UFS+S - UFS2 + Softupdates enabled
 +UFS+SUJ - UFS2 + Soft Updates + Journaling enabled
  UFS+J - UFS2 + Journaling through gjournal
    ZFS - Z File System, pools / mounts created automatically
   SWAP - BSD Swap space partition, mountpoint should be set to "none"
  
  Adding the ".eli" extension to any of the above file systems
  will enable disk encryption via geli
 -(UFS.eli, UFS+S.eli, UFS+J.eli, ZFS.eli, SWAP.eli)
 +(UFS.eli, UFS+S.eli, UFS+SUJ.eli, UFS+J.eli, ZFS.eli, SWAP.eli)
  
  If you with to use a passphrase with this encrypted partition, on the next line
  the flag "encpass=" should be entered:
 _______________________________________________
 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:
