[PC-BSD Commits] r667 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2007-09-05 13:30:00 -0700 (Wed, 05 Sep 2007)
New Revision: 667

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Setup network configurations script to now automatically include a tray
icon by default for detected NICS. That should make it easier for users
to setup their network prefs after booting for the first time. 



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2007-09-05 17:44:42 UTC (rev 666)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2007-09-05 20:30:00 UTC (rev 667)
@@ -53,12 +53,46 @@
    if [ "$?" = "0" ]
    then
      echo "ifconfig_${i}0=\"DHCP\"" >> /mnt/etc/rc.conf
+
+     # Create the tray loader .desktop file
+     case ${i} in
+       iwi|wi|awi) FLAG="-wireless" ;;
+                *) FLAG="-ethernet" ;;
+     esac
+
+     for u in `ls /mnt/usr/home`
+     do
+        echo "[Desktop Entry]
+Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}
+Icon=network
+StartupNotify=false
+Type=Application" > /mnt/usr/home/${u}/.kde/Autostart/tray-${i}.desktop
+       chmod 755 /mnt/usr/home/${u}/.kde/Autostart/tray-${i}.esktop
+     done
    fi
 
    echo " ${config}" | grep " ${i}1"  >/dev/null 2>/dev/null
    if [ "$?" = "0" ]
    then
      echo "ifconfig_${i}1=\"DHCP\"" >> /mnt/etc/rc.conf
+
+     # Create the tray loader .desktop file
+     case ${i} in
+       iwi|wi|awi) FLAG="-wireless" ;;
+                *) FLAG="-ethernet" ;;
+     esac
+
+     for u in `ls /mnt/usr/home`
+     do
+        echo "[Desktop Entry]
+Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}
+Icon=network
+StartupNotify=false
+Type=Application" > /mnt/usr/home/${u}/.kde/Autostart/tray-${i}.desktop
+       chmod 755 /mnt/usr/home/${u}/.kde/Autostart/tray-${i}.esktop
+     done
+     
    fi
 
 done
+

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2007-09-05 17:44:42 UTC (rev 666)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2007-09-05 20:30:00 UTC (rev 667)
@@ -96,8 +96,6 @@
 echo "" > /mnt/var/log/cups/access_log
 echo "" > /mnt/var/log/cups/error_log
 
-# Make sure each dir is "chowned" properly
-/usr/local/pcbsd/scripts/PCBSD.SetUserPerms.sh
 
 # Setup all Network Cards to be DHCP Now
 /usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
@@ -112,6 +110,9 @@
 # Run sound detection
 /usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh
 
+# Make sure each dir is "chowned" properly
+/usr/local/pcbsd/scripts/PCBSD.SetUserPerms.sh
+
 #echo "Unmounting Disk...";
 # Get the disks to unmount
 UMNTDEVS="`cat /mnt/etc/fstab | grep ufs | cut -d ' ' -f 1`"