-def sysexec( cmd, log= None ):
+def sysexec( cmd, log= None, fsck = False ):
"""
execute a system command, output the results to the logger
if log <> None
"""
if VERBOSE_MODE:
print ("sysexec >>> %s" % cmd)
- prog= popen2.Popen4( cmd, 0 )
+
+ prog = popen2.Popen4( cmd, 0 )
if prog is None:
raise BootManagerException, \
"Unable to create instance of popen2.Popen4 " \
except KeyboardInterrupt:
raise BootManagerException, "Interrupted by user"
- returncode= prog.wait()
- # revert http://git.planet-lab.org/?p=bootmanager.git;a=commitdiff;h=cca3a2cd2096c0235dddb5982b1f05c8d4c7f916
- # as 256 returned by Python
- #
- ## cat test.py
- #import popen2
- #
- #cmd = "false"
- #prog = popen2.Popen4( cmd, 0 )
- #returncode = prog.wait()
- #print returncode
- #
- ## python test.py
- # 256
- if returncode != 0:
- raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
-
- prog= None
+ returncode = prog.wait()
+
+ if fsck:
+ # The exit code returned by fsck is the sum of the following conditions:
+ # 0 - No errors
+ # 1 - File system errors corrected
+ # 2 - System should be rebooted
+ # 4 - File system errors left uncorrected
+ # 8 - Operational error
+ # 16 - Usage or syntax error
+ # 32 - Fsck canceled by user request
+ # 128 - Shared library error
+ if returncode != 0 and returncode != 1:
+ raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
+ else:
+ if returncode != 0:
+ raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
+ prog = None
return 1