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

svn at pcbsd.org svn at pcbsd.org
Sat May 24 06:24:45 PDT 2008


Author: melkor
Date: 2008-05-24 06:24:45 -0700 (Sat, 24 May 2008)
New Revision: 1964

Added:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CheckVMware.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DesktopSetup.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DisableDenyHosts.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EjectCD.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EnableNumlock.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatDisk.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallComponents.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopDetect.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountLangCD.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetDetect.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetUserPerms.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.TimeZone.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.UpgradeFindLinks.sh
Log:

Scripts parametrization


Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 FirstUser=""
 
 AUTOLOGIN="${1}"
@@ -8,16 +11,16 @@
 #mkdir /mnt/usr/home 
 
 # Run the passwd script
-chmod 755 /mnt/tmp/setPass
-chroot /mnt /tmp/setPass
+chmod 755 ${FSMNT}/tmp/setPass
+chroot ${FSMNT} /tmp/setPass
 
 #cd /mnt/home/${1}
 
 #Setup script to set user perms
-echo "#!/bin/sh" >/mnt/tmp/SetPerms
-chmod 755 /mnt/tmp/SetPerms
+echo "#!/bin/sh" >${FSMNT}/tmp/SetPerms
+chmod 755 ${FSMNT}/tmp/SetPerms
 
-for i in `cat /mnt/tmp/users`
+for i in `cat ${FSMNT}/tmp/users`
 do
 
   if [ "$FirstUser" = "" ]
@@ -25,34 +28,34 @@
    FirstUser="${i}"
   fi
 
-  echo "chown -R ${i}:${i} ${i}" >> /mnt/tmp/SetPerms
+  echo "chown -R ${i}:${i} ${i}" >> ${FSMNT}/tmp/SetPerms
 
 done
 
 # Run the SetPerms Scripts
-chroot /mnt /tmp/SetPerms
+chroot ${FSMNT} /tmp/SetPerms
 
 if [ "${AUTOLOGIN}" = "0" ]
 then
 
 # Add the auto-login user line
-sed -e "s/AutoLoginUser=/AutoLoginUser=${FirstUser}/g" /mnt/usr/local/share/config/kdm/kdmrc  > /mnt/tmp/sed
+sed -e "s/AutoLoginUser=/AutoLoginUser=${FirstUser}/g" ${FSMNT}/usr/local/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/local/share/config/kdm/kdmrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/local/share/config/kdm/kdmrc
 
 else
 
 # Add the auto-login user line
-sed -e "s/AutoLoginEnable=true/AutoLoginEnable=false/g" /mnt/usr/local/share/config/kdm/kdmrc  > /mnt/tmp/sed
+sed -e "s/AutoLoginEnable=true/AutoLoginEnable=false/g" ${FSMNT}/usr/local/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/local/share/config/kdm/kdmrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/local/share/config/kdm/kdmrc
 
 fi
 
 #Remove the passwd script
-rm -f /mnt/tmp/setPass
-rm -f /mnt/tmp/users
-rm -f /mnt/tmp/SetPerms
+rm -f ${FSMNT}/tmp/setPass
+rm -f ${FSMNT}/tmp/users
+rm -f ${FSMNT}/tmp/SetPerms
 
 # Copy the .kde defaults to root's dir
-cp -r /mnt/usr/share/skel/.kde /mnt/root/
+cp -r ${FSMNT}/usr/share/skel/.kde ${FSMNT}/root/

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CheckVMware.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CheckVMware.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CheckVMware.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 grep "vmware" /etc/X11/xorg.conf >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then

Added: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config


Property changes on: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
___________________________________________________________________
Name: svn:executable
   + *

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -3,6 +3,9 @@
 # HD, saving us space in the PCBSD.tar.lzma file
 ##############################################################################
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 cd /
-tar cvf - -T /usr/local/pcbsd/scripts/extraCopy | tar xvf - -C /mnt 2>/dev/null
+tar cvf - -T /usr/local/pcbsd/scripts/extraCopy | tar xvf - -C ${FSMNT} 2>/dev/null
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DesktopSetup.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DesktopSetup.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DesktopSetup.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
 
 # Check for laptop and run setup script if we need to
 /usr/local/pcbsd/scripts/PCBSD.LaptopDetect.sh 2>/dev/null >/dev/null
@@ -8,10 +10,10 @@
      exit ;;
 esac
 
-cd /mnt/usr/home
+cd ${FSMNT}/usr/home
 for i in `ls`
 do
-   rm /mnt/usr/home/${i}/.kde/Autostart/battery.desktop
+   rm ${FSMNT}/usr/home/${i}/.kde/Autostart/battery.desktop
 done
 
 cd /

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DisableDenyHosts.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DisableDenyHosts.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DisableDenyHosts.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,8 +1,11 @@
 #!/bin/sh
 
-cat /mnt/etc/rc.conf | grep -v "Denyhosts" | grep -v "denyhosts" >/tmp/rc.conf.tmp
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
+cat ${FSMNT}/etc/rc.conf | grep -v "Denyhosts" | grep -v "denyhosts" >/tmp/rc.conf.tmp
 echo "
 # Denyhosts Startup
 denyhosts_enable=\"NO\"" >> /tmp/rc.conf.tmp
-mv /tmp/rc.conf.tmp /mnt/etc/rc.conf
+mv /tmp/rc.conf.tmp ${FSMNT}/etc/rc.conf
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EjectCD.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EjectCD.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EjectCD.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 /sbin/umount `cat /tmp/cdmnt` 
 /usr/sbin/cdcontrol -f `cat /tmp/cdmnt` eject
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EnableNumlock.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EnableNumlock.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.EnableNumlock.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 /usr/local/pcbsd/scripts/PCBSD.LaptopDetect.sh
 if [ "$?" = "1" ]
 then

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,7 +1,10 @@
 !/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 echo "Starting install..."
-cd /mnt
+cd ${FSMNT}
 
 # Unset LANG variable
 LANGOLD="$LANG"
@@ -11,28 +14,28 @@
 LC_CTYPE="" ; export LC_CTYPE
 LC_COLLATE="" ; export LC_COLLATE
 
-lzma -d -c /cdmnt/PCBSD.tar.lzma | tar -xpvf - >&1 2>&1
+lzma -d -c ${CDMNT}/PCBSD.tar.lzma | tar -xpvf - >&1 2>&1
 if [ "$?" != "0" ]
 then
   exit 1
 fi
 
-mkdir /mnt/dev >/dev/null
-mkdir /mnt/mnt >/dev/null
+mkdir ${FSMNT}/dev >/dev/null
+mkdir ${FSMNT}/mnt >/dev/null
 
 #Reset LANG
 LANG="$LANGOLD"
 
 echo "Setting up kernel...";
-cp f /usr/local/pcbsd/LANGS/* /mnt/PCBSD/LANGS/ >/dev/null
+cp f /usr/local/pcbsd/LANGS/* ${FSMNT}/PCBSD/LANGS/ >/dev/null
 
-cp /tmp/fstab /mnt/etc/fstab
+cp /tmp/fstab ${FSMNT}/etc/fstab
 
 # Enable the linprocfs support
-echo "linprocfs	/compat/linux/proc	linprocfs rw	0  0" >> /mnt/etc/fstab
+echo "linprocfs	/compat/linux/proc	linprocfs rw	0  0" >> ${FSMNT}/etc/fstab
 
 # Enable the procfs since Policy Kit needs it
-echo "proc	/proc	procfs rw	0  0" >> /mnt/etc/fstab
+echo "proc	/proc	procfs rw	0  0" >> ${FSMNT}/etc/fstab
 
 
 # Remove the lp /usr/bin files for cups to work properly
@@ -42,10 +45,10 @@
 #rm /mnt/usr/bin/lprm >/dev/null 2>/dev/null
 
 # Make directories for src / obj / ports
-mkdir /mnt/usr/src >/dev/null 2>/dev/null
-mkdir /mnt/usr/obj >/dev/null 2>/dev/null
-mkdir /mnt/usr/ports >/dev/null 2>/dev/null
-mkdir /mnt/tmp >/dev/null 2>/dev/null
+mkdir ${FSMNT}/usr/src >/dev/null 2>/dev/null
+mkdir ${FSMNT}/usr/obj >/dev/null 2>/dev/null
+mkdir ${FSMNT}/usr/ports >/dev/null 2>/dev/null
+mkdir ${FSMNT}/tmp >/dev/null 2>/dev/null
 
 
 # Install kernel
@@ -56,21 +59,21 @@
 cd /boot 
 rm -rf /boot/kernel
 tar xvjpf /PCBSD/kernels/pcbsd-standard.tbz
-" >/mnt/tmp/RunOnSys.sh
+" >${FSMNT}/tmp/RunOnSys.sh
 
-chmod 755 /mnt/tmp/RunOnSys.sh
-chroot /mnt /tmp/RunOnSys.sh
+chmod 755 ${FSMNT}/tmp/RunOnSys.sh
+chroot ${FSMNT} /tmp/RunOnSys.sh
 
-rm /mnt/tmp/RunOnSys.sh
+rm ${FSMNT}/tmp/RunOnSys.sh
 
 # Set the kernel for the system tool
 echo "#!/bin/sh
 /usr/local/bin/PBReg set /PC-BSD/Kernel FBSD7.0-PCBSD7.0
 /usr/local/bin/PBReg set /PC-BSD/SystemUpdater/runAtStartup true
-" > /mnt/tmp/chKernel.sh
-chmod 755 /mnt/tmp/chKernel.sh
-chroot /mnt /tmp/chKernel.sh
-rm /mnt/tmp/chKernel.sh
+" > ${FSMNT}/tmp/chKernel.sh
+chmod 755 ${FSMNT}/tmp/chKernel.sh
+chroot /mnt ${FSMNT}/chKernel.sh
+rm ${FSMNT}/tmp/chKernel.sh
 
 
 # Copy over our redundant files from installCD to the HD

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 FOUND="0"
 
 # Check for IDE a badly formatted /var/run/dmesg.boot file first

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,12 +1,15 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 rm /tmp/AvailUpgrades >/dev/null 2>/dev/null
 
 for i in `find -E /dev -regex '/dev/(ad|ar|aacd|mixd|mlyd|amrd|idad|twed|da)[0-9]+s[1-4]' -print`
 do
   if [ -e "${i}a" ]
   then
-    mount ${i}a /mnt
+    mount ${i}a ${FSMNT}
     if [ -e "${i}b" ]
     then
       swapon ${i}b
@@ -15,24 +18,24 @@
     touch /tmp/TempUMount
     for mprt in `ls -1 ${i}[d-h]`
     do
-      MNT="`cat /mnt/etc/fstab | grep ${mprt} | cut -f 2 | cut -d " " -f 1`"
-      mount ${mprt} /mnt${MNT}\
+      MNT="`cat ${FSMNT}/etc/fstab | grep ${mprt} | cut -f 2 | cut -d " " -f 1`"
+      mount ${mprt} ${FSMNT}${MNT}\
       echo "umount ${mprt}" >> /tmp/TempUMount
     done      
   
-    if [ -e "/mnt/PCBSD" ]
+    if [ -e "${FSMNT}/PCBSD" ]
     then
 
       # Create Script
       echo "#!/bin/sh
-      /usr/local/bin/PBReg get /PC-BSD/Version >/.pcver 2>/.pcver " >/mnt/getver.sh
-      chmod 755 /mnt/getver.sh
-      chroot /mnt /getver.sh
-      VER="`cat /mnt/.pcver`"
+      /usr/local/bin/PBReg get /PC-BSD/Version >/.pcver 2>/.pcver " >${FSMNT}/getver.sh
+      chmod 755 ${FSMNT}/getver.sh
+      chroot ${FSMNT} /getver.sh
+      VER="`cat ${FSMNT}/.pcver`"
        
       # Remove old files
-      rm /mnt/.pcver
-      rm /mnt/getver.sh
+      rm ${FSMNT}/.pcver
+      rm ${FSMNT}/getver.sh
 
       # Echo our saved info
       echo "/dev/${i}a: Running PC-BSD ${VER}" >> /tmp/AvailUpgrades

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatDisk.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatDisk.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatDisk.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 #Get our Device Name
 device=${1}
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 #Get our Device Name
 device=${1}
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallComponents.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallComponents.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallComponents.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -2,6 +2,9 @@
 # Runs the scripts for each component that needs to be installed
 #######################################################################
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 while read line
 do
  echo "$line"

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,12 +1,15 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 LANG="${1}"
 
-mkdir /mnt/langpkgs
-cd /cdmnt/Langs
+mkdir ${FSMNT}/langpkgs
+cd ${CDMNT}/Langs
 
   echo "CP: Language Package"
-  cp /cdmnt/Langs/${LANG}-* /mnt/langpkgs/
+  cp ${CDMNT}/Langs/${LANG}-* ${FSMNT}/langpkgs/
 cd /
 
 echo '#!/bin/sh
@@ -15,10 +18,10 @@
 do
   echo "PKG: ${i}"
   pkg_add -f ${i} 
-done ' > /mnt/installLang.sh
+done ' > ${FSMNT}/installLang.sh
 
-chmod 755 /mnt/installLang.sh
-chroot /mnt /installLang.sh
+chmod 755 ${FSMNT}/installLang.sh
+chroot ${FSMNT} /installLang.sh
 
-rm /mnt/installLang.sh
-rm -rf /mnt/langpkgs
+rm ${FSMNT}/installLang.sh
+rm -rf ${FSMNT}/langpkgs

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopDetect.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopDetect.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopDetect.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,4 +1,8 @@
 #!/bin/sh
+
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 dmesgLine=`dmesg | grep "acpi_acad0"`
 if test "${dmesgLine}" = ""; then
        #echo "You have a desktop!"

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,18 +1,21 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 # Disable the numlock setup
 #Change the skel files
-sed -e "s/NumLock=0/NumLock=1/g" /mnt/usr/share/skel/.kde/share/config/kcminputrc  > /mnt/tmp/sed
+sed -e "s/NumLock=0/NumLock=1/g" ${FSMNT}/usr/share/skel/.kde/share/config/kcminputrc  > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kcminputrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kcminputrc
 
 # now change all the user accounts
-cd /mnt/usr/home
+cd ${FSMNT}/usr/home
 for i in `ls`
 do
-sed -e "s/NumLock=0/NumLock=1/g" /mnt/usr/home/${i}/.kde/share/config/kcminputrc  > /mnt/tmp/sed
+sed -e "s/NumLock=0/NumLock=1/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kcminputrc  > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kcminputrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kcminputrc
 done
 
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 LANG="${1}"
 KEYLAYOUT="${2}"
 
@@ -151,48 +154,48 @@
 
 #Change the skel files
 ##########################################################################
-sed -e "s/Country=us/Country=${COUNTRY}/g" /mnt/usr/share/skel/.kde/share/config/kdeglobals  > /mnt/tmp/sed
+sed -e "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals  > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kdeglobals
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals
 
 # Change the language
 ##########################################################################
-sed -e "s/Language=en_US/Language=${SETLANG}/g" /mnt/usr/share/skel/.kde/share/config/kdeglobals > /mnt/tmp/sed
+sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kdeglobals 
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals 
 
 # Change the keyboard layout tool
 ##########################################################################
-sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" /mnt/usr/share/skel/.kde/share/config/kxkbrc > /mnt/tmp/sed
+sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kxkbrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc
 
 #Change the root files
 ##########################################################################
-sed -e "s/Country=C/Country=${COUNTRY}/g" /mnt/root/.kde/share/config/kdeglobals  > /mnt/tmp/sed
+sed -e "s/Country=C/Country=${COUNTRY}/g" ${FSMNT}/root/.kde/share/config/kdeglobals  > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/root/.kde/share/config/kdeglobals
+mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde/share/config/kdeglobals
 
-sed -e "s/Language=en_US/Language=${SETLANG}/g" /mnt/root/.kde/share/config/kdeglobals > /mnt/tmp/sed
+sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/root/.kde/share/config/kdeglobals > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/root/.kde/share/config/kdeglobals 
+mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde/share/config/kdeglobals 
 
 #Change KDM Langs
 ##########################################################################
-sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" /mnt/usr/local/share/config/kdm/kdmrc > /mnt/tmp/sed
+sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" ${FSMNT}/usr/local/share/config/kdm/kdmrc > ${FSMNT}/tmp/sed
 
-mv /mnt/tmp/sed /mnt/usr/local/share/config/kdm/kdmrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/local/share/config/kdm/kdmrc
 
 # Change the profile and csh.cshrc file
 ###########################################################################
 #if [ "${LOCALE}" != "en_US" ]
 #then
 #
-#sed -e "s/en_US/${LOCALE}/g" /mnt/etc/profile > /mnt/tmp/sed
-#mv /mnt/tmp/sed /mnt/etc/profile
+#sed -e "s/en_US/${LOCALE}/g" ${FSMNT}/etc/profile > ${FSMNT}/tmp/sed
+#mv ${FSMNT}/tmp/sed ${FSMNT}/etc/profile
 #
-#sed -e "s/en_US/${LOCALE}/g" /mnt/etc/csh.cshrc > /mnt/tmp/sed
-#mv /mnt/tmp/sed /mnt/etc/csh.cshrc
+#sed -e "s/en_US/${LOCALE}/g" ${FSMNT}/etc/csh.cshrc > ${FSMNT}/tmp/sed
+#mv ${FSMNT}/tmp/sed ${FSMNT}/etc/csh.cshrc
 # 
 #fi
 
@@ -202,36 +205,36 @@
         :charset=UTF-8:\\
         :lang=${LOCALE}.UTF-8:\\
         :tc=default:
-" >> /mnt/etc/login.conf
+" >> ${FSMNT}/etc/login.conf
 
 # Build /etc/login.conf.db
-chroot /mnt /usr/bin/cap_mkdb /etc/login.conf
+chroot ${FSMNT}/usr/bin/cap_mkdb /etc/login.conf
 
 
 # Change User Langs
 ###########################################################################
-cd /mnt/usr/home
+cd ${FSMNT}/usr/home
 for i in `ls`
 do
   #Change user locale profile
-  chroot /mnt /usr/sbin/pw ${i} -L ${LANG}-utf
+  chroot ${FSMNT}/usr/sbin/pw ${i} -L ${LANG}-utf
 
-  if [ -f "/mnt/usr/home/${i}/.kde/share/config/kdeglobals" ]
+  if [ -f "${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals" ]
   then
-  sed -e "s/Country=us/Country=${COUNTRY}/g" /mnt/usr/home/${i}/.kde/share/config/kdeglobals  > /mnt/tmp/sed
+  sed -e "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals  > ${FSMNT}/tmp/sed
 
-  mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kdeglobals
+  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals
 
-  sed -e "s/Language=en_US/Language=${SETLANG}/g" /mnt/usr/home/${i}/.kde/share/config/kdeglobals > /mnt/tmp/sed
+  sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals > ${FSMNT}/tmp/sed
 
-  mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kdeglobals 
+  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals 
 
   fi
 
   # Change the keyboard layout tool
-  sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" /mnt/usr/home/${i}/.kde/share/config/kxkbrc > /mnt/tmp/sed
+  sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc > ${FSMNT}/tmp/sed
 
-  mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kxkbrc
+  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc
 done
 
 # Set the keylayout in rc.conf
@@ -254,13 +257,13 @@
    tr) KEYLAYOUT_CONSOLE="tr.iso9.q" ;;
    *)  KEYLAYOUT_CONSOLE="${KEYLAYOUT}.iso" ;;
 esac
-echo "keymap=\"${KEYLAYOUT_CONSOLE}\"" >>/mnt/etc/rc.conf
+echo "keymap=\"${KEYLAYOUT_CONSOLE}\"" >>${FSMNT}/etc/rc.conf
 
 
 # Setup LANG for PBM
 echo "#!/bin/sh
-LANG=${LANG}; export LANG" >/mnt/PCBSD/LANGS/PCBSDLANG
-chmod 755 /mnt/PCBSD/LANGS/PCBSDLANG
+LANG=${LANG}; export LANG" >${FSMNT}/PCBSD/LANGS/PCBSDLANG
+chmod 755 ${FSMNT}/PCBSD/LANGS/PCBSDLANG
 
 #Setup script to set user perms
 echo '#!/bin/sh
@@ -269,16 +272,16 @@
 do
   chown -R ${i}:${i} ${i} 
 done
-' >/mnt/tmp/SetPerms
+' >${FSMNT}/tmp/SetPerms
 
 # Remove the ja-vlgothic if we are not running in japanese
 if [ "${LANG}" != "ja" ]
 then
-  echo 'pkg_delete -f ja-vlgothic\*' >>/mnt/tmp/SetPerms
+  echo 'pkg_delete -f ja-vlgothic\*' >>${FSMNT}/tmp/SetPerms
 fi
 
 
-chmod 755 /mnt/tmp/SetPerms
-chroot /mnt /tmp/SetPerms
-rm /mnt/tmp/SetPerms
+chmod 755 ${FSMNT}/tmp/SetPerms
+chroot ${FSMNT} /tmp/SetPerms
+rm ${FSMNT}/tmp/SetPerms
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,20 +1,22 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
 
 FOUND=0
 
 for i in `ls -1 /dev/acd* /dev/cd* /dev/scd* /dev/rscd*`
 do
   # Find the CD Device
-  /sbin/mount_cd9660 $i /cdmnt
-  if [ -e "/cdmnt/PCBSD.tar.lzma" ]
+  /sbin/mount_cd9660 $i ${CDMNT}
+  if [ -e "${CDMNT}/PCBSD.tar.lzma" ]
   then
    FOUND=1
    CDDEV="$i"
    break
   else
-   /sbin/umount /cdmnt >/dev/null 2>/dev/null
-  fi
+   /sbin/umount ${CDMNT} >/dev/null 2>/dev/null
+  fi 
 done
 
 if [ "${FOUND}" = "1" ]

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 if [ -e "/tmp/mirrorDrive" ]
 then
   ROOTPART="/dev/mirror/gm0s1"
@@ -30,7 +33,7 @@
 
 echo "Creating fstab file";
 
-mount -o rw${MNTOPTS} ${ROOTPART}a${EXTENSION} /mnt >/dev/null 2>/dev/null
+mount -o rw${MNTOPTS} ${ROOTPART}a${EXTENSION} ${FSMNT} >/dev/null 2>/dev/null
 
 if [ -e "/tmp/mirrorDrive" ]
 then
@@ -55,7 +58,7 @@
   
 fi
 
-mkdir /mnt/etc
+mkdir ${FSmnt}/etc
 
 if [ -e "/tmp/encSwap" ]
 then
@@ -75,34 +78,34 @@
 ##
 if [ "${3}" ]
 then
-   mkdir -p /mnt${2}
+   mkdir -p ${FSMNT}${2}
    echo "${ROOTPART}e${EXTENSION}          	${3}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount -o rw${MNTOPTS} ${ROOTPART}e${EXTENSION} /mnt${3}
+   mount -o rw${MNTOPTS} ${ROOTPART}e${EXTENSION} ${FSMNT}${3}
 fi
 
 if [ "${4}" ]
 then
-   mkdir -p /mnt${4}
+   mkdir -p ${FSMNT}${4}
    echo "${ROOTPART}f${EXTENSION}          	${4}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount -o rw${MNTOPTS} ${ROOTPART}f${EXTENSION} /mnt${4}
+   mount -o rw${MNTOPTS} ${ROOTPART}f${EXTENSION} ${FSMNT}${4}
 fi
 
 if [ "${5}" ]
 then
-   mkdir -p /mnt${5}
+   mkdir -p ${FSMNT}${5}
    echo "${ROOTPART}g${EXTENSION}          	${5}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount -o rw${MNTOPTS} ${ROOTPART}g${EXTENSION} /mnt${5}
+   mount -o rw${MNTOPTS} ${ROOTPART}g${EXTENSION} ${FSMNT}${5}
 fi
 
 if [ "${6}" ]
 then
-   mkdir -p /mnt${6}
+   mkdir -p ${FSMNT}${6}
    echo "${ROOTPART}h${EXTENSION}          	${6}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount -o rw${MNTOPTS} ${ROOTPART}h${EXTENSION} /mnt${6}
+   mount -o rw${MNTOPTS} ${ROOTPART}h${EXTENSION} ${FSMNT}${6}
 fi
 
 cd /

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountLangCD.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountLangCD.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountLangCD.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 # Give a few seconds for CD drive to settle first
 sleep 8 
 
@@ -8,14 +11,14 @@
 for i in `ls -1 /dev/acd* /dev/cd* /dev/scd* /dev/rscd*`
 do
   # Find the CD Device
-  /sbin/mount_cd9660 $i /cdmnt
-  if [ -e "/cdmnt/README-Langs.txt" ]
+  /sbin/mount_cd9660 $i ${CDMNT}
+  if [ -e "${CDMNT}/README-Langs.txt" ]
   then
    FOUND=1
    CDDEV="$i"
    break
   else
-   /sbin/umount /cdmnt >/dev/null 2>/dev/null
+   /sbin/umount ${CDMNT} >/dev/null 2>/dev/null
   fi
 done
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 # Reset the LANG stuff
 MM_CHARSET="" ; export MM_CHARSET
 LANG="" ; export LANG
@@ -9,60 +12,60 @@
 
 PART=${1}
 
-mount ${PART}a /mnt
+mount ${PART}a ${FSMNT}
 sleep 2
 
-MNT="`cat /mnt/etc/fstab | grep ${PART}e | cut -f 2 | cut -d " " -f 1`" >/dev/null 2>/dev/null
-mount ${PART}e /mnt${MNT} >/dev/null 2>/dev/null
+MNT="`cat ${FSMNT}/etc/fstab | grep ${PART}e | cut -f 2 | cut -d " " -f 1`" >/dev/null 2>/dev/null
+mount ${PART}e ${FSMNT}${MNT} >/dev/null 2>/dev/null
         
-MNT1="`cat /mnt/etc/fstab | grep ${PART}f | cut -f 2 | cut -d " " -f 1`" >/dev/null 2>/dev/null
-mount ${PART}f /mnt${MNT1} >/dev/null 2>/dev/null
+MNT1="`cat ${FSMNT}/etc/fstab | grep ${PART}f | cut -f 2 | cut -d " " -f 1`" >/dev/null 2>/dev/null
+mount ${PART}f ${FSMNT}${MNT1} >/dev/null 2>/dev/null
 
-MNT2="`cat /mnt/etc/fstab | grep ${PART}g | cut -f 2 | cut -d " " -f 1`" >/dev/null 2>/dev/null
-mount ${PART}g /mnt${MNT2} >/dev/null 2>/dev/null
+MNT2="`cat ${FSMNT}/etc/fstab | grep ${PART}g | cut -f 2 | cut -d " " -f 1`" >/dev/null 2>/dev/null
+mount ${PART}g ${FSMNT}${MNT2} >/dev/null 2>/dev/null
 
 sleep 1
 
 echo "..."
-cd /mnt
+cd ${FSMNT}
 
 
 #Backup the various user data 
 echo "Saving user data..."
-mkdir -p /mnt/tmp/upgradebackup
-mv /mnt/usr/local/share/applnk /mnt/tmp/upgradebackup/
-mv /mnt/usr/local/share/config/kdm/kdmrc /mnt/tmp/upgradebackup/
-mv /mnt/usr/local/MyPrograms /mnt/tmp/upgradebackup/
-mv /mnt/usr/local/etc /mnt/tmp/upgradebackup/localetc
-mv /mnt/Programs /mnt/tmp/upgradebackup/
-mv /mnt/home /mnt/tmp/upgradebackup/home
-mv /mnt/root /mnt/tmp/upgradebackup/root
-mv /mnt/usr/local/share/locale /mnt/tmp/upgradebackup/locale
+mkdir -p ${FSMNT}/tmp/upgradebackup
+mv ${FSMNT}/usr/local/share/applnk ${FSMNT}/tmp/upgradebackup/
+mv ${FSMNT}/usr/local/share/config/kdm/kdmrc ${FSMNT}/tmp/upgradebackup/
+mv ${FSMNT}/usr/local/MyPrograms ${FSMNT}/tmp/upgradebackup/
+mv ${FSMNT}/usr/local/etc ${FSMNT}/tmp/upgradebackup/localetc
+mv ${FSMNT}/Programs ${FSMNT}/tmp/upgradebackup/
+mv ${FSMNT}/home ${FSMNT}/tmp/upgradebackup/home
+mv ${FSMNT}/root ${FSMNT}/tmp/upgradebackup/root
+mv ${FSMNT}/usr/local/share/locale ${FSMNT}/tmp/upgradebackup/locale
 
 
 # Search for any links that PBIs may have created
 echo "Searching for PBI created links..."
-/usr/local/pcbsd/scripts/PCBSD.UpgradeFindLinks.sh >/mnt/saveLinks
-tar cvf /mnt/tmp/links.tar -T /mnt/saveLinks >/dev/null 2>/dev/null
-rm /mnt/saveLinks >/dev/null 2>/dev/null 
+/usr/local/pcbsd/scripts/PCBSD.UpgradeFindLinks.sh >${FSMNT}/saveLinks
+tar cvf ${FSMNT}/tmp/links.tar -T ${FSMNT}/saveLinks >/dev/null 2>/dev/null
+rm ${FSMNT}/saveLinks >/dev/null 2>/dev/null 
 
 
 echo "Cleaning up old installation..."
-chflags -R noschg /mnt
+chflags -R noschg ${FSMNT}
 rm -rf boot 2>/dev/null
 rm -rf lib 2>/dev/null
 rm -rf libexec 2>/dev/null 
 rm -rf var 2>/dev/null
 
 # Setup our loop to remove stuff in /usr, saving certian dirs
-for i in `ls /mnt/usr`
+for i in `ls ${FSMNT}/usr`
 do
  case ${i} in
     home) z="1" ;;
    ports) z="1" ;;
      src) z="1" ;;
 Programs) z="1" ;;
-       *) rm -rf /mnt/usr/${i} 2>/dev/null ;;
+       *) rm -rf ${FSMNT}/usr/${i} 2>/dev/null ;;
  esac
 done
 
@@ -70,21 +73,21 @@
 rm -f /root/standard-supfile 2>/dev/null
 
 # Move back the local/etc directory so it gets saved / upgraded
-mkdir -p /mnt/usr/local
-mv /mnt/tmp/upgradebackup/localetc /mnt/usr/local/etc
+mkdir -p ${FSMNT}/usr/local
+mv ${FSMNT}/tmp/upgradebackup/localetc ${FSMNT}/usr/local/etc
 
-mv /mnt/etc/X11/XF86Config /mnt/etc/X11/XF86Config.preUpgrade 2>/dev/null
-mv /mnt/etc/X11/xorg.conf /mnt/etc/X11/xorg.conf.preUpgrade 2>/dev/null
-rm /mnt/var/run/denyhosts.pid
+mv ${FSMNT}/etc/X11/XF86Config ${FSMNT}/etc/X11/XF86Config.preUpgrade 2>/dev/null
+mv ${FSMNT}/etc/X11/xorg.conf ${FSMNT}/etc/X11/xorg.conf.preUpgrade 2>/dev/null
+rm ${FSMNT}/var/run/denyhosts.pid
 
 # Move back the applnk directory
-mkdir -p /mnt/usr/local/share
-chmod 755 /mnt/usr
-chmod 755 /mnt/usr/local
-chmod 755 /mnt/usr/local/share
-chmod 755 /mnt/usr/local/share/locale
-mv -f /mnt/tmp/upgradebackup/applnk /mnt/usr/local/share/applnk
-mv -f /mnt/tmp/upgradebackup/locale /mnt/usr/local/share/locale
+mkdir -p ${FSMNT}/usr/local/share
+chmod 755 ${FSMNT}/usr
+chmod 755 ${FSMNT}/usr/local
+chmod 755 ${FSMNT}/usr/local/share
+chmod 755 ${FSMNT}/usr/local/share/locale
+mv -f ${FSMNT}/tmp/upgradebackup/applnk ${FSMNT}/usr/local/share/applnk
+mv -f ${FSMNT}/tmp/upgradebackup/locale ${FSMNT}/usr/local/share/locale
 
 # Start the Tar Extraction now
 
@@ -92,38 +95,38 @@
 LANGOLD="$LANG"
 LANG=""
 
-lzma -d -c /cdmnt/PCBSD.tar.lzma  | tar xvp -X /usr/local/pcbsd/scripts/excUpgrade -f - >&1 2>&1
+lzma -d -c ${CDMNT}/PCBSD.tar.lzma  | tar xvp -X /usr/local/pcbsd/scripts/excUpgrade -f - >&1 2>&1
 
 #Reset LANG
 LANG="$LANGOLD"
 
-cp -f /usr/local/pcbsd/LANGS/* /mnt/PCBSD/LANGS/ >/dev/null
+cp -f /usr/local/pcbsd/LANGS/* ${FSMNT}/PCBSD/LANGS/ >/dev/null
 
 # Restore old data
 echo "Restoring saved data..."
-rm -rf /mnt/Programs
-rm -rf /mnt/home
-rm -rf /mnt/root
+rm -rf ${FSMNT}/Programs
+rm -rf ${FSMNT}/home
+rm -rf ${FSMNT}/root
 
-mv -f /mnt/tmp/upgradebackup/kdmrc /mnt/usr/local/share/config/kdm/kdmrc
-mv -f /mnt/tmp/upgradebackup/MyPrograms /mnt/usr/local/MyPrograms
-mv -f /mnt/tmp/upgradebackup/Programs /mnt/Programs
-mv -f /mnt/tmp/upgradebackup/home /mnt/home
-mv -f /mnt/tmp/upgradebackup/root /mnt/root
+mv -f ${FSMNT}/tmp/upgradebackup/kdmrc ${FSMNT}/usr/local/share/config/kdm/kdmrc
+mv -f ${FSMNT}/tmp/upgradebackup/MyPrograms ${FSMNT}/usr/local/MyPrograms
+mv -f ${FSMNT}/tmp/upgradebackup/Programs ${FSMNT}/Programs
+mv -f ${FSMNT}/tmp/upgradebackup/home ${FSMNT}/home
+mv -f ${FSMNT}/tmp/upgradebackup/root ${FSMNT}/root
 
 cd /
 
 # Extract the saved PBI links
-tar xvf /mnt/tmp/links.tar >/dev/null 2>/dev/null
-rm /mnt/tmp/links.tar 2>/dev/null
+tar xvf ${FSMNT}/tmp/links.tar >/dev/null 2>/dev/null
+rm ${FSMNT}/tmp/links.tar 2>/dev/null
 
 # Make directories for src / obj / ports
-mkdir /mnt/usr/src >/dev/null 2>/dev/null
-mkdir /mnt/usr/obj >/dev/null 2>/dev/null
-mkdir /mnt/usr/ports >/dev/null 2>/dev/null
-mkdir /mnt/var/tmp >/dev/null 2>/dev/null
-chmod 777 /mnt/var/tmp
-chmod +t /mnt/var/tmp
+mkdir ${FSMNT}/usr/src >/dev/null 2>/dev/null
+mkdir ${FSMNT}/usr/obj >/dev/null 2>/dev/null
+mkdir ${FSMNT}/usr/ports >/dev/null 2>/dev/null
+mkdir ${FSMNT}/var/tmp >/dev/null 2>/dev/null
+chmod 777 ${FSMNT}/var/tmp
+chmod +t ${FSMNT}/var/tmp
 
 # Any post install stuff here
 echo "........................";
@@ -136,21 +139,21 @@
 cd /boot 
 rm -rf /boot/kernel
 tar xvjpf /PCBSD/kernels/pcbsd-standard.tbz
-" >/mnt/tmp/RunOnSys.sh
+" >${FSMNT}/tmp/RunOnSys.sh
 
-chmod 755 /mnt/tmp/RunOnSys.sh
-chroot /mnt /tmp/RunOnSys.sh
+chmod 755 ${FSMNT}/tmp/RunOnSys.sh
+chroot ${FSMNT} /tmp/RunOnSys.sh
 
-rm /mnt/tmp/RunOnSys.sh
+rm ${FSMNT}/tmp/RunOnSys.sh
 
 # Set the kernel for the system tool
 echo "#!/bin/sh
 /usr/local/bin/PBReg set /PC-BSD/Kernel FBSD7.0-PCBSD7.0
 /usr/local/bin/PBReg set /PC-BSD/SystemUpdater/runAtStartup true
-" > /mnt/tmp/chKernel.sh
-chmod 755 /mnt/tmp/chKernel.sh
-chroot /mnt /tmp/chKernel.sh
-rm /mnt/tmp/chKernel.sh
+" > ${FSMNT}/tmp/chKernel.sh
+chmod 755 ${FSMNT}/tmp/chKernel.sh
+chroot ${FSMNT} /tmp/chKernel.sh
+rm ${FSMNT}/tmp/chKernel.sh
 
 
 # Copy over our redundant files from installCD to the HD
@@ -158,19 +161,19 @@
 
 
 # Check if we are missing the username for avahi
-cat /mnt/etc/passwd | grep avahi >/dev/null 2>/dev/null
+cat ${FSMNT}/etc/passwd | grep avahi >/dev/null 2>/dev/null
 if [ "$?" != "0" ]
 then
-   echo "avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin" >> /mnt/etc/passwd
-   echo "avahi:*:558:558::0:0:Avahi Daemon User:/nonexistent:/sbin/nologin" >> /mnt/etc/master.passwd
-   echo "avahi:*:558:" >> /mnt/etc/group
+   echo "avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin" >> ${FSMNT}/etc/passwd
+   echo "avahi:*:558:558::0:0:Avahi Daemon User:/nonexistent:/sbin/nologin" >> ${FSMNT}/etc/master.passwd
+   echo "avahi:*:558:" >> ${FSMNT}/etc/group
 fi
 
-cat /mnt/etc/fstab | grep '/proc' >/dev/null 2>/dev/null
+cat ${FSMNT}/etc/fstab | grep '/proc' >/dev/null 2>/dev/null
 if [ "$?" != "0" ]
 then
   # Enable the procfs since Policy Kit needs it
-  echo "proc      /proc   procfs rw       0  0" >> /mnt/etc/fstab
+  echo "proc      /proc   procfs rw       0  0" >> ${FSMNT}/etc/fstab
 fi
 
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 HOST="pcbsd"
 
 # echo the big /etc/hosts file
@@ -35,12 +38,12 @@
 # real official assigned numbers.  Do not try to invent your own network
 # numbers but instead get one from your network provider (if any) or
 # from your regional registry (ARIN, APNIC, LACNIC, RIPE NCC, or AfriNIC.)
-# " >/mnt/etc/hosts
+# " >${FSMNT}/etc/hosts
 
 # Grep out the old hostname
-cat /mnt/etc/rc.conf | grep -v "hostname=" > /tmp/rc.tmp
-mv /tmp/rc.tmp /mnt/etc/rc.conf
-echo "hostname=\"pcbsd\"" >> /mnt/etc/rc.conf
+cat ${FSMNT}/etc/rc.conf | grep -v "hostname=" > /tmp/rc.tmp
+mv /tmp/rc.tmp ${FSMNT}/etc/rc.conf
+echo "hostname=\"pcbsd\"" >> ${FSMNT}/etc/rc.conf
 
 # Now Setup the DHCP for each card
 config="`ifconfig -l`"
@@ -52,7 +55,7 @@
    echo " ${config}" | grep " ${i}0"  >/dev/null 2>/dev/null
    if [ "$?" = "0" ]
    then
-     echo "ifconfig_${i}0=\"DHCP\"" >> /mnt/etc/rc.conf
+     echo "ifconfig_${i}0=\"DHCP\"" >> ${FSMNT}/etc/rc.conf
 
      # Create the tray loader .desktop file
      case ${i} in
@@ -60,21 +63,21 @@
                 *) FLAG="-ethernet" ;;
      esac
 
-     for u in `ls /mnt/usr/home`
+     for u in `ls ${FSMNT}/usr/home`
      do
         echo "[Desktop Entry]
 Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}0
 Icon=network
 StartupNotify=false
-Type=Application" > /mnt/usr/home/${u}/.kde/Autostart/tray-${i}0.desktop
-       chmod 755 /mnt/usr/home/${u}/.kde/Autostart/tray-${i}0.esktop
+Type=Application" > ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}0.desktop
+       chmod 755 ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}0.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
+     echo "ifconfig_${i}1=\"DHCP\"" >> ${FSMNT}/etc/rc.conf
 
      # Create the tray loader .desktop file
      case ${i} in
@@ -82,14 +85,14 @@
                 *) FLAG="-ethernet" ;;
      esac
 
-     for u in `ls /mnt/usr/home`
+     for u in `ls ${FSMNT}/usr/home`
      do
         echo "[Desktop Entry]
 Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}1
 Icon=network
 StartupNotify=false
-Type=Application" > /mnt/usr/home/${u}/.kde/Autostart/tray-${i}1.desktop
-       chmod 755 /mnt/usr/home/${u}/.kde/Autostart/tray-${i}1.esktop
+Type=Application" > ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}1.desktop
+       chmod 755 ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}1.esktop
      done
      
    fi
@@ -100,23 +103,23 @@
 echo " ${config}" | grep " nfe"  >/dev/null 2>/dev/null
 if [ "$?" != "0" ]
 then
-  cat /mnt/boot/loader.conf | grep -v "if_nfe" > /mnt/tmp/loader.new
-  mv /mnt/tmp/loader.new /mnt/boot/loader.conf
+  cat ${FSMNT}/boot/loader.conf | grep -v "if_nfe" > ${FSMNT}/tmp/loader.new
+  mv ${FSMNT}/tmp/loader.new ${FSMNT}/boot/loader.conf
 fi
 
 # Check if we need to keep the msk driver loaded
 echo " ${config}" | grep " msk"  >/dev/null 2>/dev/null
 if [ "$?" != "0" ]
 then
-  cat /mnt/boot/loader.conf | grep -v "if_msk" > /mnt/tmp/loader.new
-  mv /mnt/tmp/loader.new /mnt/boot/loader.conf
+  cat ${FSMNT}/boot/loader.conf | grep -v "if_msk" > ${FSMNT}/tmp/loader.new
+  mv ${FSMNT}/tmp/loader.new ${FSMNT}/boot/loader.conf
 fi
 
 
 # Set the default firewall rules
 echo "#!/bin/sh
 /PCBSD/Scripts/reset-firewall 
-" > /mnt/tmp/firewall
-chmod 755 /mnt/tmp/firewall
-chroot /mnt /tmp/firewall
-rm /mnt/tmp/firewall
+" > ${FSMNT}/tmp/firewall
+chmod 755 ${FSMNT}/tmp/firewall
+chroot ${FSMNT} /tmp/firewall
+rm ${FSMNT}/tmp/firewall

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetDetect.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetDetect.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetDetect.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 rm /tmp/netCards
 
 config="`ifconfig -l`"

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,6 +1,9 @@
 #!/bin/sh
 ##########################################################################
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 # Check which filesystem type we are using
 case ${2} in
   0) FS="UFS2" ;;

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 # Check that we have a valid keyboard layout
 if [ ! -e "/uzip/.keylayout" ]
 then
@@ -30,22 +33,22 @@
 # Change KDE keyboard model
 change_kxkbrc() {
 
-    KXKBRC="/mnt/usr/share/skel/.kde/share/config/kxkbrc"
-    KXKBRC_TMP="/mnt/kxkbrc.tmp"
+    KXKBRC="${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc"
+    KXKBRC_TMP="${FSMNT}/kxkbrc.tmp"
     cp ${KXKBRC} ${KXKBRC_TMP}
     sed "s/Model=pc104/Model=${MODEL}/" < ${KXKBRC_TMP} > ${KXKBRC}
 
-    KXKBRC_TMP="/mnt/kxkbrc.tmp"
+    KXKBRC_TMP="${FSMNT}/kxkbrc.tmp"
     cp ${KXKBRC} ${KXKBRC_TMP}
     sed "s/CHANGEME/${KEYMAP}/" < ${KXKBRC_TMP} > ${KXKBRC}
 
-    for i in `ls /mnt/usr/home`
+    for i in `ls ${FSMNT}/usr/home`
     do
-	KXKBRC="/mnt/usr/home/${i}/.kde/share/config/kxkbrc"
+	KXKBRC="${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc"
 	cp ${KXKBRC} ${KXKBRC_TMP}
 	sed "s/Model=pc104/Model=${MODEL}/" < ${KXKBRC_TMP} > ${KXKBRC}
 	
-        KXKBRC="/mnt/usr/home/${i}/.kde/share/config/kxkbrc"
+        KXKBRC="${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc"
 	cp ${KXKBRC} ${KXKBRC_TMP}
 	sed "s/CHANGEME/${KEYMAP}/" < ${KXKBRC_TMP} > ${KXKBRC}
     done
@@ -59,22 +62,22 @@
 do
 
 # Set the model
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/${i}"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/templates/header/${i}"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"pc105\"/\"${MODEL}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
 # Set the layout
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/${i}"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/templates/header/${i}"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
 # Set the variant
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/${i}"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/templates/header/${i}"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"intl\"/\"${VARIANT}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
@@ -84,58 +87,58 @@
 
 
 # Do it for the saved configuration as well
-XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"intl\"/\"${VARIANT}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"pc105\"/\"${MODEL}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
 # Do it for the generic VESA config
-XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"intl\"/\"${VARIANT}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"pc105\"/\"${MODEL}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
 # And for the cardDetect header
-XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.default"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.default"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"intl\"/\"${VARIANT}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.default"
-XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+XF86_CFG="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_TMP_CFG="${FSMNT}/xorg.conf.tmp"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"pc105\"/\"${MODEL}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,7 +1,10 @@
 #!/bin/sh
 
-cd /mnt/home
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
 
+cd ${FSMNT}/home
+
 for i in `ls`
 do
   if [ -d "${i}" ]
@@ -13,10 +16,10 @@
 echo "#!/bin/sh
 cd /tmp
 chown -R ${i}:${i} /home/${i}/.dmrc
-" >/mnt/tmp/chown.sh
-    chmod 755 /mnt/tmp/chown.sh
-    chroot /mnt /tmp/chown.sh
-    rm /mnt/tmp/chown.sh
+" >${FSMNT}/tmp/chown.sh
+    chmod 755 ${FSMNT}/tmp/chown.sh
+    chroot ${FSMNT} /tmp/chown.sh
+    rm ${FSMNT}/tmp/chown.sh
   fi
 done
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 layout=$1
 model=$2
 variant=$3

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetUserPerms.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetUserPerms.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetUserPerms.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 #Setup script to set user perms
 echo '#!/bin/sh
 cd /usr/home
@@ -7,9 +10,9 @@
 do
   chown -R ${i}:${i} ${i} 
 done
-' >/mnt/tmp/SetPerms
+' >${FSMNT}/tmp/SetPerms
 
-chmod 755 /mnt/tmp/SetPerms
-chroot /mnt /tmp/SetPerms
-rm /mnt/tmp/SetPerms
+chmod 755 ${FSMNT}/tmp/SetPerms
+chroot ${FSMNT} /tmp/SetPerms
+rm ${FSMNT}/tmp/SetPerms
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,13 +1,16 @@
 #!/bin/sh
 # Script to run the initial ossdetect off HD
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 echo '#!/bin/sh
 mount_devfs devfs /dev
 ossdetect
 umount /dev
-' > /mnt/snd.sh
+' > ${FSMNT}/snd.sh
 
-chmod 755 /mnt/snd.sh
-chroot /mnt /snd.sh
+chmod 755 ${FSMNT}/snd.sh
+chroot ${FSMNT} /snd.sh
 
-rm /mnt/snd.sh
+rm ${FSMNT}/snd.sh

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 LANG="${1}"
 
 if [ "${1}" = "IGNORE" ]
@@ -12,50 +15,50 @@
 sysctl -a | grep hw.model | grep AMD 2>/dev/null
 if [ "$?" = "0" ]
 then
-  cat /mnt/etc/rc.conf | grep -v "powerd" >/mnt/tmp/.rc.conf
-  mv /mnt/rmp/.rc.conf /mnt/etc/rc.conf
+  cat ${FSMNT}/etc/rc.conf | grep -v "powerd" >${FSMNT}/tmp/.rc.conf
+  mv ${FSMNT}/rmp/.rc.conf ${FSMNT}/etc/rc.conf
 fi
 
 
 if [ "${4}" = "1" ]
 then
-   echo "bsdstats_enable=\"YES\"" >> /mnt/etc/rc.conf
+   echo "bsdstats_enable=\"YES\"" >> ${FSMNT}/etc/rc.conf
 fi
 
 
 # Remove the OpenSSL keys
-rm -f /mnt/etc/ssh/*key*
+rm -f ${FSMNT}/etc/ssh/*key*
 
 # Remove the resolv.conf.save if it exists
-rm -f /mnt/etc/resolv.conf.save >/dev/null 2>/dev/null
+rm -f ${FSMNT}/etc/resolv.conf.save >/dev/null 2>/dev/null
 
 #Make sure the new /tmp dir is rwrwrw
-chmod 777 /mnt/tmp
+chmod 777 ${FSMNT}/tmp
 
 #Make sure mount & umount have setuid bit enabled
-chmod 7755 /mnt/sbin/mount*
-chmod 7755 /mnt/sbin/umount
+chmod 7755 ${FSMNT}/sbin/mount*
+chmod 7755 ${FSMNT}/sbin/umount
 
 # Copy the new splash screen over
-cp /mnt/PCBSD/splash-screens/loading-screen-en.pcx /mnt/boot/loading-screen.pcx
+cp ${FSMNT}/PCBSD/splash-screens/loading-screen-en.pcx ${FSMNT}/boot/loading-screen.pcx
 
 # Setup the Localization
 if [ "${LANG}" != "en" ]
 then
    # Copy the right splash screen over
-    cp /mnt/PCBSD/splash-screens/loading-screen-${LANG}.pcx /mnt/boot/loading-screen.pcx
+    cp ${FSMNT}/PCBSD/splash-screens/loading-screen-${LANG}.pcx ${FSMNT}/boot/loading-screen.pcx
    # Run the Localize script
    /usr/local/pcbsd/scripts/PCBSD.Localize.sh ${LANG} ${KEYLAYOUT}
 else
 
   # Remove the keyboard switcher from loading
-  rm /mnt/usr/share/skel/.kde/share/config/kxkbrc
+  rm ${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc
 
   # Remove it from the user profiles as well
-  cd /mnt/usr/home
+  cd ${FSMNT}/usr/home
   for i in `ls`
   do
-    rm /mnt/usr/home/${i}/.kde/share/config/kxkbrc
+    rm ${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc
   done
   cd / 
 
@@ -64,11 +67,11 @@
 
 # Copy over the working xorg.conf file from the install CD to the booted
 # system. This will allow us to run the Xorg configuration tool at first boot
-cp /etc/X11/xorg.conf /mnt/etc/X11/xorg.conf
-cp /mnt/etc/X11/xorg.conf /mnt/PCBSD/xorg-gui/conf/xorg.conf.basic
+cp /etc/X11/xorg.conf ${FSMNT}/etc/X11/xorg.conf
+cp ${FSMNT}/etc/X11/xorg.conf ${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic
 
 # Copy over the ttys script, which starts the autodetect process
-cp /mnt/PCBSD/xorg-gui/conf/ttys.xsetup /mnt/etc/ttys
+cp ${FSMNT}/PCBSD/xorg-gui/conf/ttys.xsetup ${FSMNT}/etc/ttys
 
 
 
@@ -92,33 +95,33 @@
 legal.intel_iwi.license_ack=1
 wlan_scan_sta_load="YES"
 wpi_load="YES"
-geom_journal_load="YES"' >/mnt/boot/loader.conf
+geom_journal_load="YES"' >${FSMNT}/boot/loader.conf
 
 if [ -e "/tmp/mirrorDrive" ]
 then
-  echo "geom_mirror_load=\"YES\"" >> /mnt/boot/loader.conf
+  echo "geom_mirror_load=\"YES\"" >> ${FSMNT}/boot/loader.conf
 fi
 
 
 # Clear out the periodic date files
-rm /mnt/PCBSD/conf/.daily
-rm /mnt/PCBSD/conf/.weekly
-rm /mnt/PCBSD/conf/.monthly
+rm ${FSMNT}/PCBSD/conf/.daily
+rm ${FSMNT}/PCBSD/conf/.weekly
+rm ${FSMNT}/PCBSD/conf/.monthly
 
 # Make sure cups logs are cleared
-echo "" > /mnt/var/log/cups/access_log
-echo "" > /mnt/var/log/cups/error_log
+echo "" > ${FSMNT}/var/log/cups/access_log
+echo "" > ${FSMNT}/var/log/cups/error_log
 
 
 # Setup all Network Cards to be DHCP Now
 /usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
 
 # Touch the wall_cmos_clock file
-touch /mnt/etc/wall_cmos_clock
+touch ${FSMNT}/etc/wall_cmos_clock
 
 
 # Make sure root shell history is removed
-rm /mnt/root/.history 2>/dev/null
+rm ${FSMNT}/root/.history 2>/dev/null
 
 # Run sound detection
 /usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh
@@ -128,7 +131,7 @@
 
 #echo "Unmounting Disk...";
 # Get the disks to unmount
-UMNTDEVS="`cat /mnt/etc/fstab | grep ufs | cut -d ' ' -f 1`"
+UMNTDEVS="`cat ${FSMNT}/etc/fstab | grep ufs | cut -d ' ' -f 1`"
 
 cd / >/dev/null
 
@@ -145,9 +148,9 @@
   fi
 done
 
-umount -f /mnt >/dev/null
+umount -f ${FSMNT} >/dev/null
 
-umount /cdmnt
+umount ${CDMNT}
 /usr/sbin/cdcontrol -f `cat /tmp/cdmnt` eject
 
 # If we need to stamp the BSD boot-loader, do it

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.TimeZone.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.TimeZone.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.TimeZone.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,18 +1,21 @@
 #!/bin/sh
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
 NTP=$1
 
 TZONE=$2
 
 # Setup TimeZone First
-cp /mnt/usr/share/zoneinfo/${TZONE} /mnt/etc/localtime
+cp ${FSMNT}/usr/share/zoneinfo/${TZONE} ${FSMNT}/etc/localtime
 
 # If the user disabled NTPD, do so now
 if [ "${NTP}" != "0" ]
 then
 
-cat /mnt/etc/rc.conf | grep -v "ntpd_enable" >/mnt/.rc.conf
-mv /mnt/.rc.conf /mnt/etc/rc.conf
+cat ${FSMNT}/etc/rc.conf | grep -v "ntpd_enable" >${FSMNT}/.rc.conf
+mv ${FSMNT}/.rc.conf ${FSMNT}/etc/rc.conf
 
 fi
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.UpgradeFindLinks.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.UpgradeFindLinks.sh	2008-05-24 13:17:37 UTC (rev 1963)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.UpgradeFindLinks.sh	2008-05-24 13:24:45 UTC (rev 1964)
@@ -1,10 +1,13 @@
 #!/bin/sh
 
-SUBDIR="/mnt/usr/local"
-SEARCHDIR="/mnt/usr/local"
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
 
-ls -lR ${SEARCHDIR} | grep -v "^total" | grep -v "^-r" | grep -v "^drw" > /mnt/link-listing
+SUBDIR="${FSMNT}/usr/local"
+SEARCHDIR="${FSMNT}/usr/local"
 
+ls -lR ${SEARCHDIR} | grep -v "^total" | grep -v "^-r" | grep -v "^drw" > ${FSMNT}/link-listing
+
 while read line
 do
 
@@ -29,6 +32,6 @@
 
  fi
 
-done < /mnt/link-listing
+done < ${FSMNT}/link-listing
 
-rm /mnt/link-listing
+rm ${FSMNT}/link-listing



More information about the Commits mailing list