diff --git a/sysupd b/sysupd index 365ff22..aeba6d1 100755 --- a/sysupd +++ b/sysupd @@ -2,14 +2,7 @@ # Update Various System Files, Ports, etc. # Copyright (c) 2006, TundraWare Inc, Des Plaines, IL USA # All Rights Reserved -# $Id: sysupd,v 1.101 2006/02/10 06:39:59 root Exp $ - - -##### -# The CVSHOST To Use -##### - -CVSHOST=cvsup5.freebsd.org +# $Id: sysupd,v 1.102 2006/02/13 17:10:37 toor Exp $ ##### @@ -17,17 +10,16 @@ ##### DIRCVS=/bku/LOGS -DIRINDEX=/bku/LOGS DIRMIRROR=/bku/LOGS DIRNESSUS=/bku/LOGS ##### # List Of Sets To Process By Default -# Always Do The Ports Index Rebuild *After* The Ports CVSUP ##### -DEFAULTSETS='mirror nessus ports stable index' +#DEFAULTSETS='mirror nessus ports stable' +DEFAULTSETS='mirror ports stable' # ---------------- Support Functions ---------------- # @@ -63,9 +55,7 @@ { log=$2/$1.log timestamp $log - touch $2/.$1-begin - eval $3 2>&1 >> $log - touch $2/.$1-end + touch $2/.$1-begin && eval $3 2>&1 >> $log && touch $2/.$1-end & } # End of 'runupd()' @@ -98,15 +88,6 @@ case $SET in - ### - # Rebuild Ports Index - ### - - index) - runupd $SET $DIRINDEX "cd /usr/ports && make index" - ;; - - ### # Update Mirrored FreeBSD Files ### @@ -129,8 +110,12 @@ # CVSUP Updates ### - ports|stable) - runupd $SET $DIRCVS "/usr/local/bin/cvsup -h $CVSHOST -g /root/cvsup/$SET-supfile" + ports) + runupd $SET $DIRCVS "/usr/local/bin/cvsup -h cvsup4.freebsd.org -g /root/cvsup/$SET-supfile && cd /usr/ports && make index" + ;; + + stable) + runupd $SET $DIRCVS "/usr/local/bin/cvsup -h cvsup5.freebsd.org -g /root/cvsup/$SET-supfile" ;; esac