[PC-BSD Commits] r3468 - in pbibuild/modules/pxetcs: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-02-15 12:40:33 -0800 (Sun, 15 Feb 2009)
New Revision: 3468

Modified:
   pbibuild/modules/pxetcs/copy-files
   pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/pxetcs/pbi.conf
Log:

Trigger a rebuild of pxetcs for testing, will be adding support for custom xorg configs per-thinclient here shortly



Modified: pbibuild/modules/pxetcs/copy-files
===================================================================
--- pbibuild/modules/pxetcs/copy-files	2009-02-15 20:08:34 UTC (rev 3467)
+++ pbibuild/modules/pxetcs/copy-files	2009-02-15 20:40:33 UTC (rev 3468)
@@ -1,4 +1,5 @@
 /usr/local/bin/omshell bin/
 /usr/local/sbin/dhcpd bin/
+/usr/local/sbin/dhcpd sbin/
 /usr/local/etc/rc.d/isc-* etc/rc.d/
 /usr/local/etc/dhcp-* etc/rc.d/

Modified: pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh	2009-02-15 20:08:34 UTC (rev 3467)
+++ pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh	2009-02-15 20:40:33 UTC (rev 3468)
@@ -9,7 +9,7 @@
 
 rm /usr/local/bin/omshell
 rm /usr/local/sbin/dhcpd
-rm /usr/local/etc/rc.d/isc-dhcp
+rm /Programs/rc.d/isc-dhcp
 chflags -R noschg /home/pxeboot
 rm -rf /home/pxeboot
 

Modified: pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh	2009-02-15 20:08:34 UTC (rev 3467)
+++ pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh	2009-02-15 20:40:33 UTC (rev 3468)
@@ -20,11 +20,12 @@
 
 ln -s /Programs/${PROGDIR}/bin/omshell /usr/local/bin/omshell
 ln -s /Programs/${PROGDIR}/bin/dhcpd /usr/local/sbin/dhcpd
-ln -s /Programs/${PROGDIR}/etc/rc.d/isc-dhcpd /usr/local/etc/rc.d/isc-dhcp
+ln -s /Programs/${PROGDIR}/etc/rc.d/isc-dhcpd /Programs/rc.d/isc-dhcp
 
 if [ ! -e "/usr/local/etc/dhcpd.conf" ]
 then
- cp /Programs/${PROGDIR}/pxeconf/dhcpd.conf /usr/local/etc/dhcpd.conf
+ #cp /Programs/${PROGDIR}/pxeconf/dhcpd.conf /usr/local/etc/dhcpd.conf
+ cp /Programs/${PROGDIR}/pxeconf/dhcpd.conf /Programs/${PROGDIR}/etc/dhcpd.conf
 fi
 
 echo "SETSTEPS: 2"
@@ -39,8 +40,9 @@
 # Get rid of sendmail, causes hangs during boot often
 rm /home/pxeboot/etc/rc.d/sendmail
 
-# Make our mnt/union directory, important
+# Make our pxeboot/mnt/* directories, important
 mkdir /home/pxeboot/mnt/union
+mkdir /home/pxeboot/mnt/xorg-config
 
 echo "SETSTEPS: 3"
 
@@ -100,17 +102,30 @@
 fi
 
 # Add some entries for /etc/exports
-echo "/usr/home/pxeboot -alldirs -ro -maproot=nobody -network 192.168.2 -mask 255.255.255" >>/etc/exports
+echo "/usr/home/pxeboot -alldirs -ro -maproot=nobody -network 192.168.2 -mask 255.255.255
+/usr/home/pxeboot/mnt/xorg-config -alldirs -rw -maproot=nobody -network 192.168.2 -mash 255.255.255" >>/etc/exports
 
 echo "SETSTEPS: 6"
 # Modify the kdmrc file to listen to incoming XDMCP requests
-cat /usr/local/kde4/share/config/kdm/kdmrc | sed 's/Enable=false/Enable=true/g' > /tmp/kdmrc
-mv /tmp/kdmrc /usr/local/kde4/share/config/kdm/
+if [ -e "/usr/local/kde4/share/config/kdm/kdmrc" ]
+then
+  cat /usr/local/kde4/share/config/kdm/kdmrc | sed 's/Enable=false/Enable=true/g' > /tmp/kdmrc
+  mv /tmp/kdmrc /usr/local/kde4/share/config/kdm/
+  # Modify the kdmrc file to hide the userlist by default
+  cat /usr/local/kde4/share/config/kdm/kdmrc | sed 's/UserList=true/UserList=false/g' > /tmp/kdmrc
+  mv /tmp/kdmrc /usr/local/kde4/share/config/kdm/
+fi
 
-# Modify the kdmrc file to hide the userlist by default
-cat /usr/local/kde4/share/config/kdm/kdmrc | sed 's/UserList=true/UserList=false/g' > /tmp/kdmrc
-mv /tmp/kdmrc /usr/local/kde4/share/config/kdm/
+if [ -e "/PCBSD/local/kde4/share/config/kdm/kdmrc" ]
+then
+  cat /PCBSD/local/kde4/share/config/kdm/kdmrc | sed 's/Enable=false/Enable=true/g' > /tmp/kdmrc
+  mv /tmp/kdmrc /PCBSD/local/kde4/share/config/kdm/
+  # Modify the kdmrc file to hide the userlist by default
+  cat /PCBSD/local/kde4/share/config/kdm/kdmrc | sed 's/UserList=true/UserList=false/g' > /tmp/kdmrc
+  mv /tmp/kdmrc /PCBSD/local/kde4/share/config/kdm/
+fi
 
+
 # Setup tftp
 echo "tftp   dgram   udp     wait    root    /usr/libexec/tftpd      tftpd -l -s /usr/home/pxeboot" >> /etc/inetd.conf
 

Modified: pbibuild/modules/pxetcs/pbi.conf
===================================================================
--- pbibuild/modules/pxetcs/pbi.conf	2009-02-15 20:08:34 UTC (rev 3467)
+++ pbibuild/modules/pxetcs/pbi.conf	2009-02-15 20:40:33 UTC (rev 3468)
@@ -19,7 +19,7 @@
 PBIPORT="/usr/ports/net/isc-dhcp30-server/"
 
 # PBI Version - SET to override PBIPORT autoset version
-PBIVERSION="0.8" ; export PBIVERSION
+PBIVERSION="0.9" ; export PBIVERSION
 
 # Set to "Auto or NONE" to have the PBI creator auto-populate libs or not
 PROGLIBS="Auto"
@@ -31,11 +31,11 @@
 OTHERPORT="/usr/ports/x11/xorg"
 
 # Enter your custom make options here
-MAKEOPTS="WITHOUT_HAL=YES"
+MAKEOPTS=""
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="07"
+BUILDKEY="01"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 #ARCHIGNORE="amd64" ; export ARCHIGNORE