[PC-BSD Commits] r3836 - in pbibuild/modules/pxetcs: . overlay-dir overlay-dir/pxeconf/scripts
svn at pcbsd.org
svn at pcbsd.org
Wed Apr 22 10:46:09 PDT 2009
Author: kris
Date: 2009-04-22 10:46:09 -0700 (Wed, 22 Apr 2009)
New Revision: 3836
Added:
pbibuild/modules/pxetcs/overlay-dir/pxeconf/scripts/wallpaper.png
Modified:
pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/pxetcs/overlay-dir/pxeconf/scripts/tcslogin.sh
pbibuild/modules/pxetcs/pbi.conf
Log:
Updated ThinClient and trigger a rebuild. Should fix bugs with NFS mounting, and Xorg mouse / keyboard issues. Also fixes bugs saving the clients xorg.conf file.
Modified: pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh 2009-04-21 23:04:24 UTC (rev 3835)
+++ pbibuild/modules/pxetcs/overlay-dir/PBI.RemoveScript.sh 2009-04-22 17:46:09 UTC (rev 3836)
@@ -7,6 +7,10 @@
# TIP: 'kdialog' should be used for user interaction.
#########################################
+# Save the xorg-config files, in case we plan on re-installing
+mkdir -p /Programs/share/thinclient/xorg-config-saved/
+cp /home/pxeboot/mnt/xorg-config/* /Programs/share/thinclient/xorg-config-saved/
+
rm /usr/local/bin/omshell
rm /usr/local/sbin/dhcpd
rm /Programs/rc.d/isc-dhcp
@@ -29,5 +33,6 @@
cat /etc/hosts.allow | grep -v "portmap : 192.168.2.0" > /tmp/hosts.allow
mv /tmp/hosts.allow /etc/hosts.allow
+
pw userdel -n dhcpd
pw userdel -n pxeboot
Modified: pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh 2009-04-21 23:04:24 UTC (rev 3835)
+++ pbibuild/modules/pxetcs/overlay-dir/PBI.SetupScript.sh 2009-04-22 17:46:09 UTC (rev 3836)
@@ -45,9 +45,14 @@
# Make our pxeboot/mnt/* directories, important
mkdir -p /home/pxeboot/mnt/union >/dev/null
-mkdir -p /usr/local/etc/pxeboot/xorg-config 2>/dev/null
-ln -s /usr/local/etc/pxeboot/xorg-config /home/pxeboot/mnt/xorg-config
+mkdir -p /home/pxeboot/mnt/xorg-config >/dev/null
+# Check if we have saved xorg-config files
+if [ -d "/Programs/share/thinclient/xorg-config-saved" ]
+then
+ cp /Programs/share/thinclient/xorg-config-saved/* /home/pxeboot/mnt/xorg-config/
+fi
+
# Let the user know about the pxeboot user
kdialog --title "PC-BSD Thin Client Server" --msgbox "The default password for the pxeboot user will be 'thinclient'. This should be changed as soon as possible."
@@ -55,7 +60,7 @@
# Setup the new pxeboot user with a default password
echo "thinclient" | pw useradd -n "pxeboot" -h 0 -s /bin/tcsh -d /home/pxeboot/mnt/xorg-config -c "pxeboot"
-chown -R pxeboot:pxeboot /usr/local/etc/pxeboot/xorg-config
+chown -R pxeboot:pxeboot /home/pxeboot/mnt/xorg-config
echo "SETSTEPS: 3"
@@ -150,6 +155,27 @@
rpcbind : ALL : deny|' > /tmp/hosts.allow
mv /tmp/hosts.allow /etc/hosts.allow
+# Add a bulk of IPs to /etc/hosts this fixes bugs with RPC timeouts
+# when mounting NFS
+cat /etc/hosts | grep -v "192.168.2." > /tmp/.hoststmp
+mv /tmp/.hoststmp /etc/hosts
+
+i="100"
+while
+z="1"
+do
+ if [ "${i}" = "200" ]
+ then
+ break
+ fi
+ echo "192.168.2.${i} thinclient${i}" >>/etc/hosts
+
+ i="`expr ${i} + 1`"
+
+done
+
+
+
echo "SETSTEPS: 7"
# Create our dhcpd username
pw useradd -n dhcpd
Modified: pbibuild/modules/pxetcs/overlay-dir/pxeconf/scripts/tcslogin.sh
===================================================================
--- pbibuild/modules/pxetcs/overlay-dir/pxeconf/scripts/tcslogin.sh 2009-04-21 23:04:24 UTC (rev 3835)
+++ pbibuild/modules/pxetcs/overlay-dir/pxeconf/scripts/tcslogin.sh 2009-04-22 17:46:09 UTC (rev 3836)
@@ -47,7 +47,7 @@
while
z=1
do
- dialog --menu 'Select your setup option' 15 55 10 'vesa' 'Use failsafe VESA mode' 'auto' 'Run X auto-detection' 'xorgconfig' 'Run xorgconfig for manual setup' 'test' 'Test Configuration' 'shell' 'Run Shell' 'save' 'Save working config' 'close' 'Close and Reboot' 2>/tmp/ans
+ dialog --menu 'Select your setup option' 15 55 10 'vesa' 'Use failsafe VESA mode' 'auto' 'Run X auto-detection' 'viconfig' 'Edit xorg.conf with vi' 'test' 'Test Configuration' 'shell' 'Run Shell' 'save' 'Save working config' 'close' 'Close and Reboot' 2>/tmp/ans
ANS=`cat /tmp/ans`
case $ANS in
vesa) cp /etc/scripts/cardDetect/XF86Config.compat /etc/X11/xorg.conf
@@ -56,13 +56,19 @@
read tmp
;;
auto) X -configure
- cp /root/xorg.conf.new /etc/X11/xorg.conf
+echo 'Section "ServerFlags"
+ Option "DisableVidModeExtension" "True"
+ Option "AutoAddDevices" "False"
+ Option "AllowEmptyInput" "Off"
+EndSection
+' >/etc/X11/xorg.conf
+ cat /root/xorg.conf.new >> /etc/X11/xorg.conf
+ clear
echo "Copied Xorg auto-detected config."
echo "[Press Enter to Continue]"
read tmp
;;
- xorgconfig) xorgconfig
- echo "Copied Xorg config."
+ viconfig) vi /etc/X11/xorg.conf
echo "[Press Enter to Continue]"
read tmp
;;
@@ -89,6 +95,7 @@
rm /tmp/workingX >/dev/null 2>/dev/null
echo "#!/bin/sh
+xv -root -quit -max /etc/scripts/wallpaper.png
xterm -e /bin/sh -c /tmp/testX" > /root/.xinitrc
chmod 755 /root/.xinitrc
@@ -112,6 +119,8 @@
else
# User didn't want to config X, run with autodetect
# Now bring up the X session to query for XDM servers
+ echo "Auto-detecting X settings"
+ /etc/scripts/cardDetect/x_config.sh
/usr/local/bin/X -broadcast
reboot
fi
Property changes on: pbibuild/modules/pxetcs/overlay-dir/pxeconf/scripts/wallpaper.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: pbibuild/modules/pxetcs/pbi.conf
===================================================================
--- pbibuild/modules/pxetcs/pbi.conf 2009-04-21 23:04:24 UTC (rev 3835)
+++ pbibuild/modules/pxetcs/pbi.conf 2009-04-22 17:46:09 UTC (rev 3836)
@@ -36,7 +36,7 @@
# 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="44"
+BUILDKEY="01"
# Don't build this PBI on certian processors (i386 / amd64)
#ARCHIGNORE="amd64" ; export ARCHIGNORE
More information about the Commits
mailing list