[PC-BSD Commits] r4215 - in pcbsd/trunk/pc-sysinstall: . backend components components/amarok components/filezilla components/firefox components/gimp components/k3b components/kdeedu components/kdesdk components/kdetoys components/kdewebdev components/openoffice components/opera components/pidgin components/ports components/src components/thunderbird components/vlc conf

svn at pcbsd.org svn at pcbsd.org
Fri Jul 10 12:42:19 PDT 2009 

Author: kris
Date: 2009-07-10 12:42:19 -0700 (Fri, 10 Jul 2009)
New Revision: 4215

Added:
   pcbsd/trunk/pc-sysinstall/backend/functions-installcomponents.sh
   pcbsd/trunk/pc-sysinstall/backend/functions-mountusb.sh
   pcbsd/trunk/pc-sysinstall/components/
   pcbsd/trunk/pc-sysinstall/components/amarok/
   pcbsd/trunk/pc-sysinstall/components/amarok/component.cfg
   pcbsd/trunk/pc-sysinstall/components/amarok/component.png
   pcbsd/trunk/pc-sysinstall/components/amarok/install.sh
   pcbsd/trunk/pc-sysinstall/components/filezilla/
   pcbsd/trunk/pc-sysinstall/components/filezilla/component.cfg
   pcbsd/trunk/pc-sysinstall/components/filezilla/component.png
   pcbsd/trunk/pc-sysinstall/components/filezilla/install.sh
   pcbsd/trunk/pc-sysinstall/components/firefox/
   pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg
   pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/firefox/component.png
   pcbsd/trunk/pc-sysinstall/components/firefox/install.sh
   pcbsd/trunk/pc-sysinstall/components/gimp/
   pcbsd/trunk/pc-sysinstall/components/gimp/component.cfg
   pcbsd/trunk/pc-sysinstall/components/gimp/component.png
   pcbsd/trunk/pc-sysinstall/components/gimp/install.sh
   pcbsd/trunk/pc-sysinstall/components/k3b/
   pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg
   pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/k3b/component.png
   pcbsd/trunk/pc-sysinstall/components/k3b/install.sh
   pcbsd/trunk/pc-sysinstall/components/kdeedu/
   pcbsd/trunk/pc-sysinstall/components/kdeedu/component.cfg
   pcbsd/trunk/pc-sysinstall/components/kdeedu/component.png
   pcbsd/trunk/pc-sysinstall/components/kdeedu/install.sh
   pcbsd/trunk/pc-sysinstall/components/kdesdk/
   pcbsd/trunk/pc-sysinstall/components/kdesdk/component.cfg
   pcbsd/trunk/pc-sysinstall/components/kdesdk/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/kdesdk/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/kdesdk/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/kdesdk/component.png
   pcbsd/trunk/pc-sysinstall/components/kdesdk/install.sh
   pcbsd/trunk/pc-sysinstall/components/kdetoys/
   pcbsd/trunk/pc-sysinstall/components/kdetoys/component.cfg
   pcbsd/trunk/pc-sysinstall/components/kdetoys/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/kdetoys/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/kdetoys/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/kdetoys/component.png
   pcbsd/trunk/pc-sysinstall/components/kdetoys/install.sh
   pcbsd/trunk/pc-sysinstall/components/kdewebdev/
   pcbsd/trunk/pc-sysinstall/components/kdewebdev/component.cfg
   pcbsd/trunk/pc-sysinstall/components/kdewebdev/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/kdewebdev/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/kdewebdev/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/kdewebdev/component.png
   pcbsd/trunk/pc-sysinstall/components/kdewebdev/install.sh
   pcbsd/trunk/pc-sysinstall/components/openoffice/
   pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg
   pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/openoffice/component.png
   pcbsd/trunk/pc-sysinstall/components/openoffice/install.sh
   pcbsd/trunk/pc-sysinstall/components/opera/
   pcbsd/trunk/pc-sysinstall/components/opera/component.cfg
   pcbsd/trunk/pc-sysinstall/components/opera/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/opera/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/opera/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/opera/component.png
   pcbsd/trunk/pc-sysinstall/components/opera/install.sh
   pcbsd/trunk/pc-sysinstall/components/pidgin/
   pcbsd/trunk/pc-sysinstall/components/pidgin/component.cfg
   pcbsd/trunk/pc-sysinstall/components/pidgin/component.png
   pcbsd/trunk/pc-sysinstall/components/pidgin/install.sh
   pcbsd/trunk/pc-sysinstall/components/ports/
   pcbsd/trunk/pc-sysinstall/components/ports/component.cfg
   pcbsd/trunk/pc-sysinstall/components/ports/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/ports/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/ports/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/ports/component.png
   pcbsd/trunk/pc-sysinstall/components/ports/distfiles
   pcbsd/trunk/pc-sysinstall/components/ports/install.sh
   pcbsd/trunk/pc-sysinstall/components/src/
   pcbsd/trunk/pc-sysinstall/components/src/component.cfg
   pcbsd/trunk/pc-sysinstall/components/src/component.cfg.be
   pcbsd/trunk/pc-sysinstall/components/src/component.cfg.ru
   pcbsd/trunk/pc-sysinstall/components/src/component.cfg.uk
   pcbsd/trunk/pc-sysinstall/components/src/component.png
   pcbsd/trunk/pc-sysinstall/components/src/distfiles
   pcbsd/trunk/pc-sysinstall/components/src/install.sh
   pcbsd/trunk/pc-sysinstall/components/thunderbird/
   pcbsd/trunk/pc-sysinstall/components/thunderbird/component.cfg
   pcbsd/trunk/pc-sysinstall/components/thunderbird/component.png
   pcbsd/trunk/pc-sysinstall/components/thunderbird/install.sh
   pcbsd/trunk/pc-sysinstall/components/vlc/
   pcbsd/trunk/pc-sysinstall/components/vlc/component.cfg
   pcbsd/trunk/pc-sysinstall/components/vlc/component.png
   pcbsd/trunk/pc-sysinstall/components/vlc/install.sh
Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
   pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
   pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
   pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg
   pcbsd/trunk/pc-sysinstall/pc-sysinstall
   pcbsd/trunk/pc-sysinstall/pcinstall.cfg
Log:

Updated pc-sysinstall, now added functionality to add optional components, with md5 checksum'ing
and full logging of course. 



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-07-10 19:32:01 UTC (rev 4214)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-07-10 19:42:19 UTC (rev 4215)
@@ -2,6 +2,7 @@
 # Functions which perform the extraction / installation of system to disk
 
 . ${BACKEND}/functions-mountoptical.sh
+. ${BACKEND}/functions-mountusb.sh
 
 # Performs the extraction of data to disk from DVD
 start_extract_dvd()
@@ -57,11 +58,12 @@
 
  # Lets start by figuring out what medium we are using
  case ${INSTALLMEDIUM} in
-   dvd) # Lets start by mounting the disk 
-       opt_mount 
-       start_extract_dvd
-       ;;
-    usb) start_extract_usb ;;
+    dvd) # Lets start by mounting the disk 
+         opt_mount 
+         start_extract_dvd
+         ;;
+    usb) usb_mount
+	 start_extract_usb ;;
     ftp) start_extract_ftp ;;
       *) exit_err "ERROR: Unknown install medium" ;;
  esac

Modified: pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-07-10 19:32:01 UTC (rev 4214)
+++ pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-07-10 19:42:19 UTC (rev 4215)
@@ -10,6 +10,7 @@
 . ${BACKEND}/functions-newfs.sh
 . ${BACKEND}/functions-mountdisk.sh
 . ${BACKEND}/functions-extractimage.sh
+. ${BACKEND}/functions-installcomponents.sh
 
 # Check that the config file exists
 if [ ! -e "${1}" ]
@@ -65,7 +66,8 @@
   # Disk setup complete, now lets parse WORKINGSLICES and setup the bsdlabels
   setup_disk_label
   
-  # Now we've setup the bsdlabels, lets go ahead and run newfs / zfs to setup the filesystems
+  # Now we've setup the bsdlabels, lets go ahead and run newfs / zfs 
+  # to setup the filesystems
   setup_filesystems
 
   # Lets mount the partitions now
@@ -74,8 +76,12 @@
   # We are ready to begin extraction, lets start now
   init_extraction
 
+  # Check if we have any optional modules to load 
+  install_components
+
 else
-  # We're going to do an upgrade, skip all the disk setup and start by mounting the target drive/slice
+  # We're going to do an upgrade, skip all the disk setup 
+  # and start by mounting the target drive/slice
   
 fi
 


Property changes on: pcbsd/trunk/pc-sysinstall/components/amarok/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/amarok/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/filezilla/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/filezilla/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/firefox/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/firefox/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/gimp/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/gimp/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/k3b/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/k3b/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdeedu/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdeedu/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdesdk/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdesdk/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdetoys/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdetoys/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdewebdev/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/kdewebdev/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/openoffice/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/openoffice/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/opera/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/opera/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/pidgin/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/pidgin/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/ports/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/ports/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/src/component.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/src/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/thunderbird/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/thunderbird/install.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/pc-sysinstall/components/vlc/component.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/trunk/pc-sysinstall/components/vlc/install.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf	2009-07-10 19:32:01 UTC (rev 4214)
+++ pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf	2009-07-10 19:42:19 UTC (rev 4215)
@@ -32,6 +32,16 @@
 UZIP_DIR="/usr"
 export FSMNT CDMNT UZIP_DIR
 
+# Set the location of component files on DVD / usb / ftp
+# Relative to CDMNT or the FTP root
+COMPFILEDIR="components/"
+export COMPFILEDIR
+
+# Set the component temp directory, which is relative to FSMNT
+COMPTMPDIR="/usr/.componenttmp"
+export COMPTMPDIR
+
+
 # Variables to set the location of installation data
 LZMA_FILE="PCBSD.tar.lzma"
 UZIP_FILE="PCBSD.uzip"

Modified: pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg	2009-07-10 19:32:01 UTC (rev 4214)
+++ pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg	2009-07-10 19:42:19 UTC (rev 4215)
@@ -45,23 +45,29 @@
 commitDiskLabel
 
 
-# Set if we are installing via optical, USB, or FTP
-installType=PCBSD-Desktop
-#installType=PCBSD-Desktop-OEM
-#installType=PCBSD-Server
-#installType=FreeBSD
+# Set if we are installing via dvd, USB, or FTP
 installMedium=dvd
 #installMedium=usb
 #installMedium=ftp
 #ftpPath=ftp://ftp.pcbsd.org/test
 
+# Set the type of system we are installing, PC-BSD* or FreeBSD
+installType=PCBSD-Desktop
+#installType=PCBSD-Desktop-OEM
+#installType=PCBSD-Server
+#installType=FreeBSD
+
+# Set the optional components to install
+# The specified names need to match directory in components/
+installComponents=amarok,firefox,ports
+
+# The types of files we can install
 packageType=lzma
 #packageType=tar
 #packageType=uzip
-commitInstall
 
 
-# Restore commands
+# Set if we are restoring via dvd, USB or FTP
 restoreMedium=dvd
 #restoreMedium=usb
 #restoreMedium=ftp

Modified: pcbsd/trunk/pc-sysinstall/pc-sysinstall
===================================================================
--- pcbsd/trunk/pc-sysinstall/pc-sysinstall	2009-07-10 19:32:01 UTC (rev 4214)
+++ pcbsd/trunk/pc-sysinstall/pc-sysinstall	2009-07-10 19:42:19 UTC (rev 4215)
@@ -12,6 +12,10 @@
 PROGDIR="/root/pc-sysinstall"
 export PROGDIR
 
+# Set this to the components location
+COMPDIR="${PROGDIR}/components"
+export COMPDIR
+
 # End of user-editable configuration
 #####################################################################
 

Modified: pcbsd/trunk/pc-sysinstall/pcinstall.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-07-10 19:32:01 UTC (rev 4214)
+++ pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-07-10 19:42:19 UTC (rev 4215)
@@ -28,5 +28,6 @@
 packageType=lzma
 #packageType=uzip
 #packageType=tar
+installComponents=ports,src
 commitInstall

More information about the Commits mailing list