[PC-BSD Commits] r2016 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-06-03 09:11:51 -0700 (Tue, 03 Jun 2008)
New Revision: 2016

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Updated some options for server installs, setting up the installed system



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-06-03 16:08:13 UTC (rev 2015)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-06-03 16:11:51 UTC (rev 2016)
@@ -99,11 +99,21 @@
 
 done
 
+if [ -e "${FSMNT}/PCBSD/conf/server-install" ]
+then
+  # Set the default server firewall rules, with port 22 open for SSH
+  echo "#!/bin/sh
+/PCBSD/Scripts/reset-firewall 22
+" > ${FSMNT}/tmp/firewall
 
-# Set the default firewall rules
-echo "#!/bin/sh
+else
+  # Set the default desktop firewall rules
+  echo "#!/bin/sh
 /PCBSD/Scripts/reset-firewall 
 " > ${FSMNT}/tmp/firewall
+
+fi
+
 chmod 755 ${FSMNT}/tmp/firewall
 chroot ${FSMNT} /tmp/firewall
 rm ${FSMNT}/tmp/firewall

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh	2008-06-03 16:08:13 UTC (rev 2015)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ServerSetup.sh	2008-06-03 16:11:51 UTC (rev 2016)
@@ -3,23 +3,24 @@
 # Configuration file
 . /usr/local/pcbsd/scripts/PCBSD.Config
 
-cd ${FSMNT}/home
 
-for i in `ls`
-do
-  if [ -d "${i}" ]
-  then
-    echo "[Desktop]
-Session=fluxbox" > ${i}/.dmrc
+# Set our flag, indicating that this is a server install
+touch ${FSMNT}/PCBSD/conf/server-install
 
-# Make sure the file is chowned properly
-echo "#!/bin/sh
-cd /tmp
-chown -R ${i}:${i} /home/${i}/.dmrc
-" >${FSMNT}/tmp/chown.sh
-    chmod 755 ${FSMNT}/tmp/chown.sh
-    chroot ${FSMNT} /tmp/chown.sh
-    rm ${FSMNT}/tmp/chown.sh
-  fi
-done
+cd ${FSMNT}/etc
+# Get rid of X starting in ttys
+cat ttys | grep -v "kdm" > ttys.new
+mv ttys.new ttys
 
+# Now get rid of all HAL / DBUS / Sound stuff
+cat rc.conf | grep -v "hald" | grep -v "dbus" | grep -v "polkit" | grep -v "snddetect" | grep -v "mixer" > rc.conf.new
+mv rc.conf.new rc.conf
+
+
+
+# Load the Warden from CD2 here
+#
+
+
+
+exit 0

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-06-03 16:08:13 UTC (rev 2015)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-06-03 16:11:51 UTC (rev 2016)
@@ -70,8 +70,11 @@
 cp /etc/X11/xorg.conf ${FSMNT}/etc/X11/xorg.conf
 cp ${FSMNT}/etc/X11/xorg.conf ${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic
 
-# Copy over the ttys script, which starts the autodetect process
-cp ${FSMNT}/PCBSD/xorg-gui/conf/ttys.xsetup ${FSMNT}/etc/ttys
+# Copy over the ttys script, which starts the autodetect process if on desktop
+if [ ! -e "${FSMNT}/PCBSD/conf/server-install" ]
+then
+  cp ${FSMNT}/PCBSD/xorg-gui/conf/ttys.xsetup ${FSMNT}/etc/ttys
+fi