[PC-BSD Commits] r7054 - in pcbsd/current: SysInstaller mfsroot-overlay/etc mfsroot-overlay/root

[svn at pcbsd.org]

Author: kris
Date: 2010-06-29 12:09:12 -0700 (Tue, 29 Jun 2010)
New Revision: 7054

Modified:
   pcbsd/current/SysInstaller/backend.h
   pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
   pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh
Log:

Updated pc-sysinstall locations for CURRENT to use the one in FreeBSD base now



Modified: pcbsd/current/SysInstaller/backend.h
===================================================================
--- pcbsd/current/SysInstaller/backend.h	2010-06-29 17:51:38 UTC (rev 7053)
+++ pcbsd/current/SysInstaller/backend.h	2010-06-29 19:09:12 UTC (rev 7054)
@@ -10,8 +10,8 @@
 #include <QByteArray>
 #include <QWidget>
 
-#define PCSYSINSTALL    QString("/PCBSD/pc-sysinstall/pc-sysinstall")
-#define PCSYSINSTALLDIR QString("/PCBSD/pc-sysinstall")
+#define PCSYSINSTALL    QString("/usr/sbin/pc-sysinstall")
+#define PCSYSINSTALLDIR QString("/usr/share/pc-sysinstall")
 #define PCSYSINSTALLCFG QString("/tmp/sys-install.cfg")
 #define TMPLANGFILE QString("/tmp/.SysInstallLang")
 

Modified: pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2010-06-29 17:51:38 UTC (rev 7053)
+++ pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2010-06-29 19:09:12 UTC (rev 7054)
@@ -44,14 +44,10 @@
 # Now make /PCBSD sym-links
 rm /usr/PCBSD
 mkdir /usr/PCBSD
-ln -s /root/pc-sysinstall /usr/PCBSD/pc-sysinstall
 cd /mntuzip/usr/PCBSD
 for i in `ls`
 do
-  if [ "${i}" != "pc-sysinstall" ]
-  then
-    ln -s /mntuzip/usr/PCBSD/$i /usr/PCBSD/$i
-  fi
+  ln -s /mntuzip/usr/PCBSD/$i /usr/PCBSD/$i
 done
 
 

Modified: pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh	2010-06-29 17:51:38 UTC (rev 7053)
+++ pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh	2010-06-29 19:09:12 UTC (rev 7054)
@@ -32,15 +32,14 @@
   exit 0
 fi
 
-# Mount our pc-sysinstall && SysInstaller with nullfs, makes them writable and able to debug
+# Mount our SysInstaller with nullfs, makes them writable and able to debug
 mount_nullfs /root/SysInstaller /usr/PCBSD/SysInstaller
-mount_nullfs /root/pc-sysinstall /usr/PCBSD/pc-sysinstall
 
 # Check if we have an auto-install directive
 if [ -e "/tmp/pc-autoinstall.conf" ]
 then
   # Start the parser on this directive and begin the install
-  /PCBSD/pc-sysinstall/pc-sysinstall start-autoinstall /tmp/pc-autoinstall.conf
+  /usr/sbin/pc-sysinstall start-autoinstall /tmp/pc-autoinstall.conf
 fi