svn | 2 Jun 2008 20:34

[PC-BSD Commits] r2002 - pcbsd/trunk/installcd-overlay/boot

Author: kris
Date: 2008-06-02 11:34:14 -0700 (Mon, 02 Jun 2008)
New Revision: 2002

Modified:
   pcbsd/trunk/installcd-overlay/boot/beastie.4th
Log:

Added an ZFS option to beastie menu, since ZFS needs more than our typical
kernel memory

Modified: pcbsd/trunk/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-05-31 13:33:17 UTC (rev 2001)
+++ pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-06-02 18:34:14 UTC (rev 2002)
 <at>  <at>  -194,6 +194,7  <at>  <at> 
 	printmenuitem ."  Boot PC-BSD in single user mode" bootsinglekey !
 	printmenuitem ."  Boot PC-BSD with verbose logging" bootverbosekey !
 	printmenuitem ."  Boot PC-BSD to emergency console" bootemergencykey !
+	printmenuitem ."  Boot PC-BSD with ZFS support" bootzfskey !
 	printmenuitem ."  Run installer in VESA mode" bootvesakey !
 	printmenuitem ."  Escape to loader prompt" escapekey !
 	printmenuitem ."  Reboot" rebootkey !
 <at>  <at>  -292,6 +293,12  <at>  <at> 
 			s" YES" s" boot_single" setenv
 			0 boot
 		then
+                dup bootzfskey  <at>  = if
+                        s" 512M" s" vm.kmem_size" setenv
+                        s" 512M" s" vm.kmem_size_max" setenv
(Continue reading)

svn | 2 Jun 2008 20:36

[PC-BSD Commits] r2003 - pcbsd/trunk/mfsroot-overlay/root

Author: kris
Date: 2008-06-02 11:36:28 -0700 (Mon, 02 Jun 2008)
New Revision: 2003

Modified:
   pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh
Log:

Updated installcd startup script to check if ZFS is enabled, and start the
service

Modified: pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh
===================================================================
--- pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh	2008-06-02 18:34:14 UTC (rev 2002)
+++ pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh	2008-06-02 18:36:28 UTC (rev 2003)
 <at>  <at>  -29,6 +29,7  <at>  <at> 
 echo "Detecting X Setup..."
 /usr/local/pcbsd/scripts/cardDetect/x_config.sh 

+# Check if we should be going to the console instead of X directly
 /sbin/sysctl kern.module_path | /usr/bin/grep "CONSOLE" >/dev/null 2>/dev/null
 FOUND="$?"
 if [ "$FOUND" = "0" ]
 <at>  <at>  -38,6 +39,8  <at>  <at> 
   exit
 fi

+
+# Check for VESA support
 /sbin/sysctl kern.module_path | /usr/bin/grep "VESA" >/dev/null 2>/dev/null
(Continue reading)

svn | 2 Jun 2008 20:41

[PC-BSD Commits] r2004 - pcbsd/trunk/PCInstall

Author: kris
Date: 2008-06-02 11:41:03 -0700 (Mon, 02 Jun 2008)
New Revision: 2004

Modified:
   pcbsd/trunk/PCInstall/pcinstall.ui.h
Log:

Added check to GUI to enable ZFS option if the user selected ZFS from boot
loader

Modified: pcbsd/trunk/PCInstall/pcinstall.ui.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui.h	2008-06-02 18:36:28 UTC (rev 2003)
+++ pcbsd/trunk/PCInstall/pcinstall.ui.h	2008-06-02 18:41:03 UTC (rev 2004)
 <at>  <at>  -95,7 +95,11  <at>  <at> 
     comboFileSystem->insertItem("UFS2");
     comboFileSystem->insertItem("UFS2 + Soft Updates");
     comboFileSystem->insertItem("UFS2 + Journaling");
-    comboFileSystem->insertItem("ZFS (Experimental)");
+    // Check the currently running language
+    if ( QFile::exists( "/tmp/zfsEnabled" ) )
+    {
+       comboFileSystem->insertItem("ZFS (Experimental)");
+    }
     comboFileSystem->setCurrentItem(2);
svn | 2 Jun 2008 21:02

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

Author: kris
Date: 2008-06-02 12:02:57 -0700 (Mon, 02 Jun 2008)
New Revision: 2005

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
Log:

Removed PBReg set from install CD, now it is done beforehand in the system
image itself

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-06-02
18:41:03 UTC (rev 2004)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-06-02
19:02:57 UTC (rev 2005)
 <at>  <at>  -66,16 +66,6  <at>  <at> 

 rm ${FSMNT}/tmp/RunOnSys.sh

-# Set the kernel for the system tool
-echo "#!/bin/sh
-/usr/local/bin/PBReg set /PC-BSD/Kernel FBSD7.0-PCBSD7.0
-/usr/local/bin/PBReg set /PC-BSD/SystemUpdater/runAtStartup true
-" > ${FSMNT}/tmp/chKernel.sh
-chmod 755 ${FSMNT}/tmp/chKernel.sh
-chroot /mnt ${FSMNT}/chKernel.sh
-rm ${FSMNT}/tmp/chKernel.sh
(Continue reading)

svn | 2 Jun 2008 23:04

[PC-BSD Commits] r2006 - pcbsd/trunk/system-overlay/usr/share/skel/Desktop

Author: kris
Date: 2008-06-02 14:04:45 -0700 (Mon, 02 Jun 2008)
New Revision: 2006

Added:
   pcbsd/trunk/system-overlay/usr/share/skel/Desktop/Trash.desktop
Log:

Hide teh trash icon on desktop by default, since KDE keeps recreating the
actual .desktop file :P

Added: pcbsd/trunk/system-overlay/usr/share/skel/Desktop/Trash.desktop
svn | 2 Jun 2008 23:05

[PC-BSD Commits] r2007 - pcbsd/trunk/system-overlay/PCBSD/conf

Author: kris
Date: 2008-06-02 14:05:33 -0700 (Mon, 02 Jun 2008)
New Revision: 2007

Modified:
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386
Log:

Updated kernel configs to include geom_journal, nfe and msk by default

Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-06-02 21:04:45 UTC (rev 2006)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-06-02 21:05:33 UTC (rev 2007)
 <at>  <at>  -36,6 +36,7  <at>  <at> 
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options         UFS_GJOURNAL            # Support for journaling on UFS
+options         GEOM_JOURNAL            # Journaling via GEOM
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
 <at>  <at>  -61,6 +62,7  <at>  <at> 
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
+options	        SCTP                    # Stream Control Transmission Protocol

 # Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
(Continue reading)

svn | 2 Jun 2008 23:06

[PC-BSD Commits] r2008 - pcbsd/trunk/installcd-overlay/boot

Author: kris
Date: 2008-06-02 14:06:11 -0700 (Mon, 02 Jun 2008)
New Revision: 2008

Modified:
   pcbsd/trunk/installcd-overlay/boot/loader.conf
Log:

Updated installcd loader.conf since we don't need to load nfe / msk on the 
fly anymore

Modified: pcbsd/trunk/installcd-overlay/boot/loader.conf
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/loader.conf	2008-06-02 21:05:33 UTC (rev 2007)
+++ pcbsd/trunk/installcd-overlay/boot/loader.conf	2008-06-02 21:06:11 UTC (rev 2008)
 <at>  <at>  -2,10 +2,8  <at>  <at> 
 mfsroot_type="mfs_root"
 mfsroot_name="/boot/mfsroot"
 autoboot_delay="5"                      # Set timeout for loader splash
-scd_load="YES"
-if_nfe_load="YES" 			# Load NFE driver
-if_msk_load="YES"			# Load MSK driver
-geom_journal_load="YES"                 # Load gjournal
 zfs_load="YES"				# Load ZFS 
+scd_load="YES"
+#geom_journal_load="YES"                 # Load gjournal
 #geom_stripe_load="YES"
 #geom_vinum_load="YES"
svn | 2 Jun 2008 23:07

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

Author: kris
Date: 2008-06-02 14:07:12 -0700 (Mon, 02 Jun 2008)
New Revision: 2009

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

Take out nfe / msk from install scripts since they are in kernel now

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-02
21:06:11 UTC (rev 2008)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-06-02
21:07:12 UTC (rev 2009)
 <at>  <at>  -99,23 +99,7  <at>  <at> 

 done

-# Check if we need to keep the nfe driver loaded
-echo " ${config}" | grep " nfe"  >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
-  cat ${FSMNT}/boot/loader.conf | grep -v "if_nfe" > ${FSMNT}/tmp/loader.new
-  mv ${FSMNT}/tmp/loader.new ${FSMNT}/boot/loader.conf
-fi

-# Check if we need to keep the msk driver loaded
(Continue reading)

svn | 2 Jun 2008 23:22

[PC-BSD Commits] r2010 - pcbsd/trunk/installcd-overlay/boot

Author: melkor
Date: 2008-06-02 14:22:52 -0700 (Mon, 02 Jun 2008)
New Revision: 2010

Modified:
   pcbsd/trunk/installcd-overlay/boot/beastie.4th
   pcbsd/trunk/installcd-overlay/boot/loader.conf
Log:

Some beastie.4th emprovements

Modified: pcbsd/trunk/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-06-02 21:07:12 UTC (rev 2009)
+++ pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-06-02 21:22:52 UTC (rev 2010)
 <at>  <at>  -96,18 +96,34  <at>  <at> 
 ;

 : fbsdbw-logo ( x y -- )
-	2dup at-xy ."     ____  ______" 1+
-	2dup at-xy ."    / __ \/ ____/" 1+
-	2dup at-xy ."   / /_/ / /" 1+
-	2dup at-xy ."  / ____/ /___" 1+
-	2dup at-xy ." /_/    \____/" 1+
-	2dup at-xy ."     ____ _____ ____" 1+
-	2dup at-xy ."    / __ ) ___// __ \" 1+
-	2dup at-xy ."   / __  \__ \/ / / /" 1+
-	2dup at-xy ."  / /_/ /__/ / /_/ /" 1+
-	     at-xy ." /_____/____/_____/"
+        2dup at-xy ."      ______" 1+
(Continue reading)

svn | 3 Jun 2008 13:31

[PC-BSD Commits] r2011 - in pbibuild/modules/kb: . overlay-dir

Author: kris
Date: 2008-06-03 04:31:11 -0700 (Tue, 03 Jun 2008)
New Revision: 2011

Modified:
   pbibuild/modules/kb/overlay-dir/kb-icon.png
   pbibuild/modules/kb/pbi.conf
Log:

Changed embedded icon to 32bpp RGB/Alpha so it looks right on desktop

Modified: pbibuild/modules/kb/overlay-dir/kb-icon.png
===================================================================
(Binary files differ)

Modified: pbibuild/modules/kb/pbi.conf
===================================================================
--- pbibuild/modules/kb/pbi.conf	2008-06-02 21:22:52 UTC (rev 2010)
+++ pbibuild/modules/kb/pbi.conf	2008-06-03 11:31:11 UTC (rev 2011)
 <at>  <at>  -32,6 +32,6  <at>  <at> 

 # 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="03"
+BUILDKEY="23"

 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Gmane