[PC-BSD Commits] r4012 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts
svn at pcbsd.org
svn at pcbsd.org
Mon Jun 1 07:17:59 PDT 2009
Author: kris
Date: 2009-06-01 07:17:58 -0700 (Mon, 01 Jun 2009)
New Revision: 4012
Modified:
pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh
pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
Log:
Fixed a few more stragglers on /usr/PCBSD switchover
Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config 2009-06-01 13:11:16 UTC (rev 4011)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config 2009-06-01 14:17:58 UTC (rev 4012)
@@ -1,8 +1,8 @@
#!/bin/sh
# Set our port options
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
CDMNT="/cdmnt"
FSMNT="/mnt"
Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh 2009-06-01 13:11:16 UTC (rev 4011)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh 2009-06-01 14:17:58 UTC (rev 4012)
@@ -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" ]
@@ -86,7 +86,7 @@
echo "#!/bin/sh
cd /boot
rm -rf /boot/kernel
-tar xvjpf /PCBSD/kernels/pcbsd-standard.tbz
+tar xvjpf /usr/PCBSD/kernels/pcbsd-standard.tbz
" >${FSMNT}/tmp/RunOnSys.sh
chmod 755 ${FSMNT}/tmp/RunOnSys.sh
Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh 2009-06-01 13:11:16 UTC (rev 4011)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh 2009-06-01 14:17:58 UTC (rev 4012)
@@ -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/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh 2009-06-01 13:11:16 UTC (rev 4011)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh 2009-06-01 14:17:58 UTC (rev 4012)
@@ -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/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh 2009-06-01 13:11:16 UTC (rev 4011)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh 2009-06-01 14:17:58 UTC (rev 4012)
@@ -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
More information about the Commits
mailing list