misc/152894: bin: usr.sbin/pc-sysinstall - Fixes for pc-sysinstall with lagg/tmpfs

Kris Moore kmoore at FreeBSD.org
Tue Dec 7 18:00:25 UTC 2010


>Number:         152894
>Category:       misc
>Synopsis:       bin: usr.sbin/pc-sysinstall - Fixes for pc-sysinstall with lagg/tmpfs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 07 18:00:20 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Kris Moore
>Release:        9.0-Current
>Organization:
iXsystems
>Environment:
FreeBSD 9-Current
>Description:
This fixes a few small issues in pc-sysinstall, relating to not wanting to use the "lagg" interface by default for wifi, as well as not using tmpfs for PC-BSD specific installs. 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN src.o/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh src/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
--- src.o/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh	2010-12-07 11:03:39.175621906 -0500
+++ src/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh	2010-12-07 11:09:57.718994760 -0500
@@ -233,7 +233,6 @@
   then
     echo "procfs			/proc			procfs		rw		0	0" >> ${FSTAB}
     echo "linprocfs		/compat/linux/proc	linprocfs	rw		0	0" >> ${FSTAB}
-    echo "tmpfs				/tmp			tmpfs		rw,mode=1777	0	0" >> ${FSTAB}
   fi
 
   # If we have a dedicated /boot, run the post-install setup of it now
diff -ruN src.o/usr.sbin/pc-sysinstall/backend/functions-networking.sh src/usr.sbin/pc-sysinstall/backend/functions-networking.sh
--- src.o/usr.sbin/pc-sysinstall/backend/functions-networking.sh	2010-12-07 11:03:39.173615019 -0500
+++ src/usr.sbin/pc-sysinstall/backend/functions-networking.sh	2010-12-07 11:08:39.178862859 -0500
@@ -54,7 +54,7 @@
   fi
 };
 
-# Function to get the first available wired nic, used for lagg0 setup
+# Function to get the first available wired nic, used for setup
 get_first_wired_nic()
 {
   rm ${TMPDIR}/.niclist >/dev/null 2>/dev/null
@@ -78,8 +78,9 @@
   return
 };
 
-# Function which simply enables plain dhcp on all detected nics, not fancy lagg interface
-enable_plain_dhcp_all()
+
+# Function which simply enables plain dhcp on all detected nics
+enable_dhcp_all()
 {
   rm ${TMPDIR}/.niclist >/dev/null 2>/dev/null
   # start by getting a list of nics on this system
@@ -111,57 +112,11 @@
   fi
 };
 
-# Function which enables fancy lagg dhcp on specified wifi 
-enable_lagg_dhcp()
-{
-  WIFINIC="$1"
-  
-  # Get the first wired nic
-  get_first_wired_nic
-  WIRENIC=$VAL
-  LAGGPORT="laggport ${WIFINIC}"
-
-  echo "# Auto-Enabled NICs from pc-sysinstall" >>${FSMNT}/etc/rc.conf
-  if [ ! -z "$WIRENIC" ]
-  then
-    echo "ifconfig_${WIRENIC}=\"up\"" >> ${FSMNT}/etc/rc.conf
-    echo "ifconfig_${WIFINIC}=\"\`ifconfig ${WIRENIC} ether\`\"" >> ${FSMNT}/etc/rc.conf
-    echo "ifconfig_${WIFINIC}=\"ether \${ifconfig_${WIFINIC}##*ether }\"" >> ${FSMNT}/etc/rc.conf
-    LAGGPORT="laggport ${WIRENIC} ${LAGGPORT}"
-  fi
-  
-  echo "wlans_${WIFINIC}=\"wlan0\"" >> ${FSMNT}/etc/rc.conf
-  echo "cloned_interfaces=\"lagg0\"" >> ${FSMNT}/etc/rc.conf
-  echo "ifconfig_lagg0=\"laggproto failover ${LAGGPORT} DHCP\"" >> ${FSMNT}/etc/rc.conf
-
-};
 
-# Function which detects available nics, and runs them to DHCP on the
+# Function which detects available nics, and enables dhcp on them
 save_auto_dhcp()
 {
-  rm ${TMPDIR}/.niclist >/dev/null 2>/dev/null
-  # start by getting a list of nics on this system
-  ${QUERYDIR}/detect-nics.sh > ${TMPDIR}/.niclist
-  if [ -e "${TMPDIR}/.niclist" ]
-  then
-    while read line
-    do
-      NIC="`echo $line | cut -d ':' -f 1`"
-      DESC="`echo $line | cut -d ':' -f 2`"
-      check_is_wifi "${NIC}"
-      if [ "$?" = "0" ]
-      then
-        # We have a wifi device, lets do fancy lagg interface
-        enable_lagg_dhcp "${NIC}"
-        return
-      fi
- 
-    done < ${TMPDIR}/.niclist 
-  fi
-
-  # Got here, looks like no wifi, so lets simply enable plain-ole-dhcp
-  enable_plain_dhcp_all
-
+  enable_dhcp_all
 };
 
 


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-bugs mailing list