[PC-BSD Commits] r5201 - in pcbsd/trunk/mfsroot-overlay/root: . Desktop

[svn at pcbsd.org]

Author: kris
Date: 2009-12-02 10:29:11 -0800 (Wed, 02 Dec 2009)
New Revision: 5201

Added:
   pcbsd/trunk/mfsroot-overlay/root/Desktop/
   pcbsd/trunk/mfsroot-overlay/root/Desktop/installpcbsd.desktop
Modified:
   pcbsd/trunk/mfsroot-overlay/root/.xinitrc
   pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh
   pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh
   pcbsd/trunk/mfsroot-overlay/root/PCBSDtext.sh
Log:

Updated mfsroot image, to call and use new SysInstaller, also will be able to run it from the
Live Mode, via clicking Install PC-BSD icon on desktop



Modified: pcbsd/trunk/mfsroot-overlay/root/.xinitrc
===================================================================
--- pcbsd/trunk/mfsroot-overlay/root/.xinitrc	2009-12-02 18:17:23 UTC (rev 5200)
+++ pcbsd/trunk/mfsroot-overlay/root/.xinitrc	2009-12-02 18:29:11 UTC (rev 5201)
@@ -1,38 +1,23 @@
 #!/bin/sh
 
+# Touch our marker, so that users can login on other ttys
 touch /tmp/.xstarted
 
-# Check for laptop
-/usr/local/pcbsd/scripts/PCBSD.LaptopDetect.sh 2>/dev/null >/dev/null
-case $? in
-  1) numlockx on ;;
-  2) numlockx off ;;
-esac
+# Turn off the numlock
+numlockx off
 
 # Run fluxbox in the background
 /usr/local/bin/fluxbox &
 
-# Run our setxkbmap tool to set our initial values
-/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh us pc105 off
-
-while
-i=1
-do
-
+# Make sure we have our libs
 LD_LIBRARY_PATH="/usr/local/kde4/lib:/usr/local/lib/qt4" ; export LD_LIBRARY_PATH
 
 # Turn off screensaver / blanking
 xset s off
 xset -dpms
 
+# Start the installer
+/PCBSD/SysInstaller/bin/SysInstaller
 
-/usr/local/pcbsd/bin/PCInstall
-if [ "$?" != "3" ]
-then
-   shudown -r now
-   break
-fi
-done
-
-
+# All finished, reboot now
 shutdown -r now

Modified: pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh
===================================================================
--- pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh	2009-12-02 18:17:23 UTC (rev 5200)
+++ pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh	2009-12-02 18:29:11 UTC (rev 5201)
@@ -12,6 +12,9 @@
 mv /var/tmp /tmp/vartmp
 ln -s /tmp/vartmp /var/tmp
 
+# Make /usr/PCBSD link
+ln -s /usr/PCBSD /PCBSD
+
 # Check if we are booting in LIVE or INSTALL mode
 bootlive="NO"
 l=`/bin/kenv boot_livedvd 2>/dev/null`
@@ -25,7 +28,7 @@
 if [ -e "/tmp/pc-autoinstall.conf" ]
 then
   # Start the parser on this directive and begin the install
-  /pc-sysinstall/pc-sysinstall start-autoinstall /tmp/pc-autoinstall.conf
+  /PCBSD/pc-sysinstall/pc-sysinstall start-autoinstall /tmp/pc-autoinstall.conf
 fi
 
 # Make sure this is only executed on the first login, in order for other ctrl-fX screens to work
@@ -42,9 +45,6 @@
 mkdir /tmp/.qt
 mkdir /tmp/xkb
 
-# Check for NICS on this system
-/usr/local/pcbsd/scripts/PCBSD.NetDetect.sh
-
 echo "Detecting X Setup..."
 sleep 2
 /root/cardDetect/x_config.sh 

Modified: pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh
===================================================================
--- pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh	2009-12-02 18:17:23 UTC (rev 5200)
+++ pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh	2009-12-02 18:29:11 UTC (rev 5201)
@@ -23,9 +23,6 @@
 # Link over the kernel
 ln -s /mntuzip/boot/kernel /boot/kernel
 
-# Link /PCBSD -> /usr/PCBSD
-ln -s /usr/PCBSD /PCBSD
-
 # Start some services
 /usr/local/etc/rc.d/snddetect start
 
@@ -33,7 +30,7 @@
 rm -rf /root/.kde >/dev/null 2>/dev/null
 rm -rf /root/.kde4 >/dev/null 2>/dev/null
 cp -r /usr/share/skel/.kde4 /root/
-cp -r /usr/share/skel/Desktop /root/
+cp -r /usr/share/skel/Desktop/* /root/Desktop/
 
 # Remove portsconsole / softmanager from LIVE desktop, they don't work in LIVE mode
 rm /root/Desktop/portsconsole.desktop >/dev/null 2>/dev/null

Modified: pcbsd/trunk/mfsroot-overlay/root/PCBSDtext.sh
===================================================================
--- pcbsd/trunk/mfsroot-overlay/root/PCBSDtext.sh	2009-12-02 18:17:23 UTC (rev 5200)
+++ pcbsd/trunk/mfsroot-overlay/root/PCBSDtext.sh	2009-12-02 18:29:11 UTC (rev 5201)
@@ -11,7 +11,7 @@
 i="1"
 do
 
-dialog --title "PC-BSD 1.4 (BETA) Installation Menu" --menu "Please select from the following options:" 20 55 15 install "Start graphical install" vesa "Start graphical install (VESA)" utility "System Utilities" reboot "Reboot the system" 2>/tmp/answer
+dialog --title "PC-BSD Installation Menu" --menu "Please select from the following options:" 20 55 15 install "Start graphical install" vesa "Start graphical install (VESA)" utility "System Utilities" reboot "Reboot the system" 2>/tmp/answer
 
 ANS="`cat /tmp/answer`"
 
@@ -19,7 +19,7 @@
     install) echo "Starting PC-BSD System Installer.. Please wait.."
              startx 2>/tmp/Xerrors ;;
        vesa) echo "Starting PC-BSD System Installer.. Please wait.."
- cp /usr/local/pcbsd/scripts/cardDetect/XF86Config.compat /etc/X11/xorg.conf
+ cp /root/cardDetect/XF86Config.compat /etc/X11/xorg.conf
              startx 2>/tmp/Xerrors ;;
     utility) /root/PCBSDUtil.sh
               clear ;;