#!/usr/bin/python2
-# Copyright (c) 2003 Intel Corporation
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-
-# * Neither the name of the Intel Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS OF
-# YOUR JURISDICTION. It is licensee's responsibility to comply with any
-# export regulations applicable in licensee's jurisdiction. Under
-# CURRENT (May 2000) U.S. export regulations this software is eligible
-# for export from the U.S. and can be downloaded by or otherwise
-# exported or reexported worldwide EXCEPT to U.S. embargoed destinations
-# which include Cuba, Iraq, Libya, North Korea, Iran, Syria, Sudan,
-# Afghanistan and any other country to which the U.S. has embargoed
-# goods and services.
-
-
import sys, os
from random import Random
import string
+from types import StringTypes
-# not needed now
-#PLANETLAB_BIN = "/usr/local/planetlab/bin/"
-#sys.path.append(PLANETLAB_BIN)
-#import BootServerRequest
-
+from time import strftime
+TIMEFORMAT="%Y-%m-%d %H:%M:%S"
NODEUPDATE_PID_FILE= "/var/run/NodeUpdate.pid"
# variables for cron file creation
-TARGET_SCRIPT = '(echo && date && echo && /usr/local/planetlab/bin/NodeUpdate.py start) >>/var/log/NodeUpdate.log 2>&1'
+TARGET_SCRIPT = '(echo && date && echo && /usr/bin/NodeUpdate.py start) >>/var/log/NodeUpdate.log 2>&1'
TARGET_DESC = 'Update node RPMs periodically'
TARGET_USER = 'root'
TARGET_SHELL = '/bin/bash'
EXTRA_GROUPS_FILE= '/etc/planetlab/extra-node-groups'
# file containing a list of rpms that we should attempt to delete
-# before we updating everything else. this list is not
-# removed with 'yum remove', because that could accidently remove
-# dependency rpms that were not intended to be deleted.
+# before updating everything else. This list is not removed with
+# 'yum remove', because that could accidently remove dependency rpms
+# that were not intended to be deleted.
DELETE_RPM_LIST_FILE= '/etc/planetlab/delete-rpm-list'
# print out a message only if we are displaying output
-def Message(Str):
+def Message(message):
if displayOutput:
- print Str
-
+ if isinstance(message,StringTypes) and len(message) >=2 and message[0]=="\n":
+ print "\n",
+ message=message[1:]
+ print strftime(TIMEFORMAT),
+ print message
# print out a message only if we are displaying output
def Error(Str):
+ print strftime(TIMEFORMAT),
print Str
try:
randomMinute= Random().randrange( 0, 59, 1 );
- randomHour= Random().randrange( 0, 23, 1 );
+ randomHour= Random().randrange( 0, 11, 1 );
f = open( CRON_FILE, 'w' );
f.write( "# %s\n" % (TARGET_DESC) );
f.write( "MAILTO=%s\n" % (TARGET_USER) );
f.write( "SHELL=%s\n" % (TARGET_SHELL) );
- f.write( "%s %s * * * %s %s\n\n" %
- (randomMinute, randomHour, TARGET_USER, TARGET_SCRIPT) );
+ f.write( "%s %s,%s * * * %s %s\n\n" %
+ (randomMinute, randomHour, randomHour + 12, TARGET_USER, TARGET_SCRIPT) );
f.close()
print( "Created new cron.d entry." )
def CheckProxy( self ):
- Message( "Checking existance of proxy config file..." )
+ Message( "Checking existence of proxy config file..." )
if os.access(PROXY_FILE, os.R_OK) and os.path.isfile(PROXY_FILE):
self.HTTP_PROXY= string.strip(file(PROXY_FILE,'r').readline())
Message( "No, not using --sslcertdir option" )
sslcertdir = ""
+ yum_options=""
+ Message( "\nChecking if yum supports --verbose" )
+ if os.system( "%s --help | grep -q verbose" % YUM_PATH ) == 0:
+ Message( "Yes, using --verbose option" )
+ yum_options += " --verbose"
+ else:
+ Message( "No, not using --verbose option" )
+
Message( "\nUpdating PlanetLab group" )
- os.system( "%s %s -y groupupdate \"PlanetLab\"" %
- (YUM_PATH, sslcertdir) )
+ os.system( "%s %s %s -y groupupdate \"PlanetLab\"" %
+ (YUM_PATH, yum_options, sslcertdir) )
Message( "\nUpdating rest of system" )
- os.system( "%s %s -y update" %
- (YUM_PATH, sslcertdir) )
+ os.system( "%s %s %s -y update" %
+ (YUM_PATH, yum_options, sslcertdir) )
Message( "\nChecking for extra groups to update" )
if os.access(EXTRA_GROUPS_FILE, os.R_OK) and \
else:
for group in string.split(extra_groups_contents,"\n"):
Message( "\nUpdating %s group" % group )
- os.system( "%s %s -y groupupdate \"%s\"" %
- (YUM_PATH, sslcertdir, group) )
+ os.system( "%s %s %s -y groupupdate \"%s\"" %
+ (YUM_PATH, yum_options, sslcertdir, group) )
else:
Message( "No extra groups file found" )
self.ClearRebootFlag()
os.system( "/sbin/shutdown -r now" )
-
+ def RebuildRPMdb( self ):
+ Message( "\nRebuilding RPM Database." )
+ try: os.system( "rm /var/lib/rpm/__db.*" )
+ except Exception, err: print "RebuildRPMdb: %s" % err
+ try: os.system( "%s --rebuilddb" % RPM_PATH )
+ except Exception, err: print "RebuildRPMdb: %s" % err
+
def RemoveRPMS( self ):
Message( "\nLooking for RPMs to be deleted." )
if not nodeupdate:
Error( "Unable to initialize." )
else:
+ nodeupdate.RebuildRPMdb()
nodeupdate.RemoveRPMS()
nodeupdate.InstallKeys()
nodeupdate.CheckForUpdates()
git://git.onelab.eu / nodeupdate.git / blobdiff