[PC-BSD Commits] r397 - in pcbsd/trunk/system-overlay: PCBSD/bin PCBSD/xorg-gui/bin PCBSD/xorg-gui/conf PCBSD/xorg-gui/templates PCBSD/xorg-gui/templates/driver PCBSD/xorg-gui/templates/header usr/local/share/applications/kde

svn at pcbsd.org svn at pcbsd.org
Fri Jun 29 12:11:18 PDT 2007


Author: kris
Date: 2007-06-29 20:11:18 +0100 (Fri, 29 Jun 2007)
New Revision: 397

Added:
   pcbsd/trunk/system-overlay/PCBSD/bin/pdm
   pcbsd/trunk/system-overlay/PCBSD/bin/rerunXsetup.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/apm.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/ark.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/ati.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/chips.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/cirrus.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/cyrix.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/dummy.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/fbdev.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/glint.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/i128.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/i740.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/i810.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/imstt.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/mga.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/neomagic.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/newport.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/nsc.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/nv.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/nvidia.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/rendition.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/s3.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/s3virge.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/savage.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/siliconmotion.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/sis.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/tdfx.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/tga.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/trident.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/tseng.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/vesa.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/vga.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/via.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/vmware.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/voodoo.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/i180.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic
   pcbsd/trunk/system-overlay/usr/local/share/applications/kde/pcbsdxset.desktop
Removed:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/apm.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/ark.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/ati.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/chips.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/cirrus.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/cyrix.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/dummy.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/fbdev.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/glint.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/i128.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/i740.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/i810.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/imstt.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/mga.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/neomagic.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/newport.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/nsc.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/nv.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/nvidia.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/rendition.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/s3.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/s3virge.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/savage.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/siliconmotion.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/sis.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/tdfx.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/tga.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/trident.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/tseng.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/vesa.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/vga.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/via.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/vmware.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/voodoo.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/xorg.conf.header
Modified:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/ttys.normal
Log:

New changes to X setup routine, now you can re-run the X configuration
as an Icon on in the system menu. Also the configuration for Intel 3d is
enabled, and a new template scheme has been introduced



Added: pcbsd/trunk/system-overlay/PCBSD/bin/pdm


Property changes on: pcbsd/trunk/system-overlay/PCBSD/bin/pdm
___________________________________________________________________
Name: svn:executable
   + *

Added: pcbsd/trunk/system-overlay/PCBSD/bin/rerunXsetup.sh


Property changes on: pcbsd/trunk/system-overlay/PCBSD/bin/rerunXsetup.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh	2007-06-29 18:55:31 UTC (rev 396)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh	2007-06-29 19:11:18 UTC (rev 397)
@@ -19,6 +19,8 @@
 ###############################################################################
 # Start the script now
 
+clear
+
 echo "Please wait... Start X-Configuration Utility"
 
 # Check if we need to save an existing .xinitrc file
@@ -95,7 +97,7 @@
 echo '#!/bin/sh
 /usr/local/bin/fluxbox &
 PID=$!
-kdialog --msgbox "PC-BSD will now allow you to setup your monitor resolution and video settings.\n If your system is equipped with a nVidia video card, you may wish to select the nvidia driver on the advanced tab. This will enable you to run the 3D desktop, Beryl.i\n\nNOTE: Beryl requires a color depth of 24."
+kdialog --msgbox "PC-BSD will now allow you to setup your monitor resolution and video settings.\n If your system is equipped with a 3D card, please select the appropriate driver from the 'Advanced' tab. This will enable you to run the 3D desktop, Beryl.\n\nNOTE: Beryl requires a color depth of 24."
 /PCBSD/xorg-gui/bin/XGUI
 kill -9 ${PID}
 if [ "$?" = "1" ]

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2007-06-29 18:55:31 UTC (rev 396)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2007-06-29 19:11:18 UTC (rev 397)
@@ -6,7 +6,10 @@
 
 TMPFILE="/PCBSD/xorg-gui/.xorg.conf.tmp"
 
-cp /PCBSD/xorg-gui/templates/xorg.conf.header $TMPFILE
+case ${DRIVER} in
+  i810) cp /PCBSD/xorg-gui/templates/header/i180.xorg.conf $TMPFILE ;;
+     *) cp /PCBSD/xorg-gui/templates/header/xorg.conf.generic $TMPFILE ;;
+esac
 
 # Setup the monitor section with GTF values
 echo '
@@ -39,7 +42,7 @@
 
 
 # Copy over the defined template for the specific driver
-cat /PCBSD/xorg-gui/templates/${DRIVER}.template >>$TMPFILE
+cat /PCBSD/xorg-gui/templates/driver/${DRIVER}.template >>$TMPFILE
 
 
 # Now create the Screen section
@@ -111,3 +114,12 @@
 fi
 
 
+# Check for intel i180 driver
+if [ "${DRIVER}" = "i810" ]
+then
+  # Since we are using the i810 driver allow the beryl autostart
+  touch /PCBSD/conf/beryl-enable
+fi
+
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/ttys.normal
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/ttys.normal	2007-06-29 18:55:31 UTC (rev 396)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/ttys.normal	2007-06-29 19:11:18 UTC (rev 397)
@@ -37,7 +37,7 @@
 ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv3	"/usr/libexec/getty Pc" 	cons25	on  secure
-ttyv4	"/usr/local/bin/kdm"		xterm	on  secure
+ttyv4	"/PCBSD/bin/pdm"		xterm	on  secure
 #ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
 #ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
 #ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/apm.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/ark.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/ati.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/chips.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/cirrus.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/cyrix.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/apm.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/ark.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/ati.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/chips.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/cirrus.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/cyrix.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/dummy.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/fbdev.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/glint.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/i128.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/i740.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/i810.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/imstt.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/mga.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/neomagic.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/newport.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/nsc.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/nv.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/nvidia.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/rendition.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/s3.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/s3virge.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/savage.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/siliconmotion.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/sis.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/tdfx.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/tga.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/trident.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/tseng.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/vesa.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/vga.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/via.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/vmware.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/voodoo.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/dummy.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/fbdev.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/glint.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/i180.xorg.conf

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/i128.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/i740.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/i810.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/imstt.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/mga.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/neomagic.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/newport.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/nsc.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/nv.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/nvidia.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/rendition.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/s3.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/s3virge.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/savage.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/siliconmotion.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/sis.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/tdfx.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/tga.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/trident.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/tseng.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/vesa.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/vga.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/via.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/vmware.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/voodoo.template

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/xorg.conf.header

Added: pcbsd/trunk/system-overlay/usr/local/share/applications/kde/pcbsdxset.desktop



More information about the Commits mailing list