svn commit: r227118 - head/usr.sbin/pc-sysinstall/backend

[Josh Paetzel]

Author: jpaetzel
Date: Sat Nov  5 19:25:21 2011
New Revision: 227118
URL: http://svn.freebsd.org/changeset/base/227118

Log:
  Roll up several patches used by PC-BSD.
  
  - Fix an issue with gmirror.
  - Allow IPv4 DHCP and IPv6 SLAAC concurrently.
  - Fix zpool options using the wrong device name.
  
  Approved by:	kib (mentor)
  Obtained from:	kris at pcbsd.org
  MFC after:	3 days

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  head/usr.sbin/pc-sysinstall/backend/functions-networking.sh
  head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	Sat Nov  5 18:27:47 2011	(r227117)
+++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	Sat Nov  5 19:25:21 2011	(r227118)
@@ -280,7 +280,7 @@ setup_gpart_partitions()
       if [ "${_pType}" = "gpt" ] ; then
         get_fs_line_xvars "${_pDisk}p${CURPART}" "${STRING}"
       else
-        get_fs_line_xvars "${_wSlice}" "${STRING}"
+        get_fs_line_xvars "${_wSlice}${PARTLETTER}" "${STRING}"
       fi
       XTRAOPTS="${VAR}"
 

Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-disk.sh	Sat Nov  5 18:27:47 2011	(r227117)
+++ head/usr.sbin/pc-sysinstall/backend/functions-disk.sh	Sat Nov  5 19:25:21 2011	(r227118)
@@ -470,7 +470,8 @@ setup_disk_slice()
               # Default to round-robin if the user didn't specify
               if [ -z "$MIRRORBAL" ]; then MIRRORBAL="round-robin" ; fi
 
-              echo "$MIRRORDISK:$MIRRORBAL:gm${gmnum}" >${MIRRORCFGDIR}/$DISK
+	      _mFile=`echo $DISK | sed 's|/|%|g'`
+              echo "$MIRRORDISK:$MIRRORBAL:gm${gmnum}" >${MIRRORCFGDIR}/$_mFile
 	      init_gmirror "$gmnum" "$MIRRORBAL" "$DISK" "$MIRRORDISK"
 
 	      # Reset DISK to the gmirror device

Modified: head/usr.sbin/pc-sysinstall/backend/functions-networking.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-networking.sh	Sat Nov  5 18:27:47 2011	(r227117)
+++ head/usr.sbin/pc-sysinstall/backend/functions-networking.sh	Sat Nov  5 19:25:21 2011	(r227118)
@@ -431,6 +431,10 @@ start_networking()
   elif [ "$NETDEV" = "IPv6-SLAAC" ]
   then
     enable_auto_slaac
+  elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ]
+  then
+    enable_auto_dhcp
+    enable_auto_slaac
   else
     enable_manual_nic ${NETDEV}
   fi
@@ -457,6 +461,10 @@ save_networking_install()
   elif [ "$NETDEV" = "IPv6-SLAAC" ]
   then
     save_auto_slaac
+  elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ]
+  then
+    save_auto_dhcp
+    save_auto_slaac
   else
     save_manual_nic ${NETDEV}
   fi

Modified: head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh	Sat Nov  5 18:27:47 2011	(r227117)
+++ head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh	Sat Nov  5 19:25:21 2011	(r227118)
@@ -43,7 +43,7 @@ start_gmirror_sync()
 {
 
   cd ${MIRRORCFGDIR}
-  for DISK in `ls *`
+  for DISK in `ls ${MIRRORCFGDIR}`
   do
     MIRRORDISK="`cat ${DISK} | cut -d ':' -f 1`"
     MIRRORBAL="`cat ${DISK} | cut -d ':' -f 2`"
@@ -51,7 +51,7 @@ start_gmirror_sync()
    
     # Start the mirroring service
     rc_nohalt "gmirror forget ${MIRRORNAME}"
-    rc_halt "gmirror insert ${MIRRORNAME} /dev/${MIRRORDISK}"
+    rc_halt "gmirror insert ${MIRRORNAME} ${MIRRORDISK}"
 
   done