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

svn at pcbsd.org svn at pcbsd.org
Wed May 20 07:31:06 PDT 2009


Author: kris
Date: 2009-05-20 07:31:05 -0700 (Wed, 20 May 2009)
New Revision: 3972

Modified:
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
   pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Cleanup our trunk scripts, make them use /usr/PCBSD



Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -39,16 +39,16 @@
 then
 
 # Add the auto-login user line
-sed -e "s/AutoLoginUser=/AutoLoginUser=${FirstUser}/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
+sed -e "s/AutoLoginUser=/AutoLoginUser=${FirstUser}/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 
 else
 
 # Add the auto-login user line
-sed -e "s/AutoLoginEnable=true/AutoLoginEnable=false/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
+sed -e "s/AutoLoginEnable=true/AutoLoginEnable=false/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 
 fi
 

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -49,7 +49,7 @@
 mkdir ${FSMNT}/mnt >/dev/null
 
 echo "Setting up kernel...";
-cp f /usr/local/pcbsd/LANGS/* ${FSMNT}/PCBSD/LANGS/ >/dev/null
+cp f /usr/local/pcbsd/LANGS/* ${FSMNT}/usr/PCBSD/LANGS/ >/dev/null
 
 # Copy over the generated fstab
 if [ ! -e "/tmp/runningUpgrade" ]

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -169,8 +169,8 @@
 
 #Change KDM Langs
 ##########################################################################
-sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc > ${FSMNT}/tmp/sed
-mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc > ${FSMNT}/tmp/sed
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 
 # Change the profile and csh.cshrc file
 ###########################################################################

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -66,7 +66,7 @@
      for u in `ls ${FSMNT}/usr/home`
      do
         echo "[Desktop Entry]
-Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}0
+Exec=/usr/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}0
 Icon=network
 StartupNotify=false
 Type=Application" > ${FSMNT}/usr/home/${u}/.kde4/Autostart/tray-${i}0.desktop
@@ -88,7 +88,7 @@
      for u in `ls ${FSMNT}/usr/home`
      do
         echo "[Desktop Entry]
-Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}1
+Exec=/usr/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}1
 Icon=network
 StartupNotify=false
 Type=Application" > ${FSMNT}/usr/home/${u}/.kde4/Autostart/tray-${i}1.desktop
@@ -99,17 +99,17 @@
 
 done
 
-if [ -e "${FSMNT}/PCBSD/conf/server-install" ]
+if [ -e "${FSMNT}/usr/PCBSD/conf/server-install" ]
 then
   # Set the default server firewall rules, with port 22 open for SSH
   echo "#!/bin/sh
-/PCBSD/Scripts/reset-firewall 22
+/usr/PCBSD/Scripts/reset-firewall 22
 " > ${FSMNT}/tmp/firewall
 
 else
   # Set the default desktop firewall rules
   echo "#!/bin/sh
-/PCBSD/Scripts/reset-firewall 
+/usr/PCBSD/Scripts/reset-firewall 
 " > ${FSMNT}/tmp/firewall
 
 fi

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -26,7 +26,7 @@
         grep "/usr/local" ${f} >/dev/null 2>/dev/null
         if [ "$?" = "0" ]
         then
-          sed -e "s|/usr/local|/PCBSD/local|g" ${f} >${f}.tmp
+          sed -e "s|/usr/local|/usr/PCBSD/local|g" ${f} >${f}.tmp
           mv ${f}.tmp ${f}
         fi
       fi
@@ -69,8 +69,8 @@
 then
    USER="`cat /tmp/autologinuser`"
    # Add the auto-login user line
-   sed -e "s/AutoLoginUser=/AutoLoginUser=${USER}/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
-   mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+   sed -e "s/AutoLoginUser=/AutoLoginUser=${USER}/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
+   mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 fi
 
 

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -15,46 +15,46 @@
   fi
 fi
 
-if [ -e "${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc" ]
+if [ -e "${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc" ]
 then
-   grep "^AutoLoginEnable=true" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc >/dev/null 2>/dev/null
+   grep "^AutoLoginEnable=true" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc >/dev/null 2>/dev/null
   if [ "$?" = "0" ]
   then 
-   grep "^AutoLoginUser=" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc | cut -d "=" -f 2 >/tmp/autologinuser
+   grep "^AutoLoginUser=" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc | cut -d "=" -f 2 >/tmp/autologinuser
   fi
 fi
 
 # Save any PBI mime data
-if [ -d "${FSMNT}/PCBSD/local" ]
+if [ -d "${FSMNT}/usr/PCBSD/local" ]
 then
-  tar cvf ${FSMNT}/pbimimedata.tar ${FSMNT}/PCBSD/local/kde4/share/applnk/.hidden ${FSMNT}/PCBSD/local/share/mime/packages ${FSMNT}/PCBSD/local/share/applications/mimeapps.list
+  tar cvf ${FSMNT}/pbimimedata.tar ${FSMNT}/usr/PCBSD/local/kde4/share/applnk/.hidden ${FSMNT}/usr/PCBSD/local/share/mime/packages ${FSMNT}/usr/PCBSD/local/share/applications/mimeapps.list
 fi
 
 cd ${FSMNT}
 
-# Clean up some of the /PCBSD entries before starting an upgrade
+# Clean up some of the /usr/PCBSD entries before starting an upgrade
 echo "Cleaning old FileSystem... This may take a while."
 chflags -R noschg ${FSMNT}
 echo "Cleaning old FileSystem... This may take a while.."
-rm -rf ${FSMNT}/PCBSD/local
+rm -rf ${FSMNT}/usr/PCBSD/local
 echo "Cleaning old FileSystem... This may take a while..."
-rm -rf ${FSMNT}/PCBSD/Scripts
-rm -rf ${FSMNT}/PCBSD/bin
+rm -rf ${FSMNT}/usr/PCBSD/Scripts
+rm -rf ${FSMNT}/usr/PCBSD/bin
 echo "Cleaning old FileSystem... This may take a while...."
-rm -rf ${FSMNT}/PCBSD/packages
-rm -rf ${FSMNT}/PCBSD/Components
-rm -rf ${FSMNT}/PCBSD/SystemUpdater
+rm -rf ${FSMNT}/usr/PCBSD/packages
+rm -rf ${FSMNT}/usr/PCBSD/Components
+rm -rf ${FSMNT}/usr/PCBSD/SystemUpdater
 echo "Cleaning old FileSystem... This may take a while....."
-rm -rf ${FSMNT}/PCBSD/docs
-rm -rf ${FSMNT}/PCBSD/files
-rm -rf ${FSMNT}/PCBSD/images
-rm -rf ${FSMNT}/PCBSD/includes
-rm -rf ${FSMNT}/PCBSD/kernels
+rm -rf ${FSMNT}/usr/PCBSD/docs
+rm -rf ${FSMNT}/usr/PCBSD/files
+rm -rf ${FSMNT}/usr/PCBSD/images
+rm -rf ${FSMNT}/usr/PCBSD/includes
+rm -rf ${FSMNT}/usr/PCBSD/kernels
 echo "Cleaning old FileSystem... This may take a while......"
-rm -rf ${FSMNT}/PCBSD/networkmanager
-rm -rf ${FSMNT}/PCBSD/soundDetect
-rm -rf ${FSMNT}/PCBSD/splash-screens
-rm -rf ${FSMNT}/PCBSD/var
+rm -rf ${FSMNT}/usr/PCBSD/networkmanager
+rm -rf ${FSMNT}/usr/PCBSD/soundDetect
+rm -rf ${FSMNT}/usr/PCBSD/splash-screens
+rm -rf ${FSMNT}/usr/PCBSD/var
 echo "Cleaning old FileSystem... This may take a while......."
 rm -rf ${FSMNT}/lib
 rm -rf ${FSMNT}/libexec

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -66,21 +66,21 @@
 do
 
 # Set the model
-XF86_CFG="${FSMNT}/PCBSD/xorg-gui/templates/header/${i}"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/templates/header/${i}"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/templates/header/${i}"
+XF86_CFG="${FSMNT}/usr/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}
@@ -91,57 +91,57 @@
 
 
 # Do it for the saved configuration as well
-XF86_CFG="${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_CFG="${FSMNT}/usr/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="${FSMNT}/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_CFG="${FSMNT}/usr/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}

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -5,7 +5,7 @@
 
 
 # Set our flag, indicating that this is a server install
-touch ${FSMNT}/PCBSD/conf/server-install
+touch ${FSMNT}/usr/PCBSD/conf/server-install
 
 cd ${FSMNT}/etc
 # Get rid of X starting in ttys

Modified: pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-05-19 19:46:26 UTC (rev 3971)
+++ pcbsd/trunk-current/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-05-20 14:31:05 UTC (rev 3972)
@@ -41,17 +41,17 @@
 
 
 # Copy the new splash screen over
-cp ${FSMNT}/PCBSD/splash-screens/loading-screen-en.pcx ${FSMNT}/boot/loading-screen.pcx
+cp ${FSMNT}/usr/PCBSD/splash-screens/loading-screen-en.pcx ${FSMNT}/boot/loading-screen.pcx
 
 # 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
-cat /etc/X11/xorg.conf | sed 's|/usr/local|/PCBSD/local|g' > ${FSMNT}/etc/X11/xorg.conf
-cp ${FSMNT}/etc/X11/xorg.conf ${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic
+cat /etc/X11/xorg.conf | sed 's|/usr/local|/usr/PCBSD/local|g' > ${FSMNT}/etc/X11/xorg.conf
+cp ${FSMNT}/etc/X11/xorg.conf ${FSMNT}/usr/PCBSD/xorg-gui/conf/xorg.conf.basic
 
 # Copy over the ttys script, which starts the autodetect process if on desktop
-if [ ! -e "${FSMNT}/PCBSD/conf/server-install" ]
+if [ ! -e "${FSMNT}/usr/PCBSD/conf/server-install" ]
 then
-  cp ${FSMNT}/PCBSD/xorg-gui/conf/ttys.xsetup ${FSMNT}/etc/ttys
+  cp ${FSMNT}/usr/PCBSD/xorg-gui/conf/ttys.xsetup ${FSMNT}/etc/ttys
 fi
 
 
@@ -84,9 +84,9 @@
 fi 
 
 # Clear out the periodic date files
-rm ${FSMNT}/PCBSD/conf/.daily
-rm ${FSMNT}/PCBSD/conf/.weekly
-rm ${FSMNT}/PCBSD/conf/.monthly
+rm ${FSMNT}/usr/PCBSD/conf/.daily
+rm ${FSMNT}/usr/PCBSD/conf/.weekly
+rm ${FSMNT}/usr/PCBSD/conf/.monthly
 
 # Make sure cups logs are cleared
 echo "" > ${FSMNT}/var/log/cups/access_log
@@ -123,7 +123,7 @@
 if [ "${LANG}" != "en" ]
 then
    # Copy the right splash screen over
-    cp ${FSMNT}/PCBSD/splash-screens/loading-screen-${LANG}.pcx ${FSMNT}/boot/loading-screen.pcx
+    cp ${FSMNT}/usr/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
@@ -150,9 +150,9 @@
 
 # Any post install stuff here
 echo "#!/bin/sh
-cd /PCBSD/local/share/mime
-update-mime-database /PCBSD/local/share/mime
-update-mime-database /PCBSD/local/kde4/share/mime
+cd /usr/PCBSD/local/share/mime
+update-mime-database /usr/PCBSD/local/share/mime
+update-mime-database /usr/PCBSD/local/kde4/share/mime
 " >${FSMNT}/tmp/RunOnSys.sh
 
 chmod 755 ${FSMNT}/tmp/RunOnSys.sh



More information about the Commits mailing list