#!/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
-# not needed now
-#PLANETLAB_BIN = "/usr/local/planetlab/bin/"
-#sys.path.append(PLANETLAB_BIN)
-#import BootServerRequest
-
-
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'
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()
%define name NodeUpdate
-%define version 0.4
-%define release 4%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 0.5
+%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
+Distribution: PlanetLab 4.1
URL: http://cvs.planet-lab.org/cvs/NodeUpdate
Summary: PlanetLab service to periodically update node RPMS
%install
-install -D -m 755 NodeUpdate.py $RPM_BUILD_ROOT/usr/local/planetlab/bin/NodeUpdate.py
+install -D -m 755 NodeUpdate.py $RPM_BUILD_ROOT/usr/bin/NodeUpdate.py
install -D -m 644 NodeUpdate.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/NodeUpdate
%clean
%files
%defattr(-,root,root)
-%attr(0755,root,root) /usr/local/planetlab/bin/NodeUpdate.py*
+%attr(0755,root,root) /usr/bin/NodeUpdate.py*
%attr(0644,root,root) /etc/logrotate.d/NodeUpdate
%pre
%post
-/usr/local/planetlab/bin/NodeUpdate.py updatecron
+/usr/bin/NodeUpdate.py updatecron
%preun
if [ "$1" = 0 ]; then
- /usr/local/planetlab/bin/NodeUpdate.py removecron
+ /usr/bin/NodeUpdate.py removecron
fi
%changelog
+* Fri Aug 10 2007 Faiyaz Ahmed <faiyaza@cs.princeton.edu>
+- Rebuild RPM Database nightly to avoid corruption
+- Move working directory from /usr/local to /usr/bin
+
* Tue Nov 16 2004 Mark Huang <mlhuang@cs.princeton.edu>
- cron job now dumps to /var/log/NodeUpdate instead of spewing mail
- cron job now runs once a day instead of once an hour