Skip to content
Snippets Groups Projects
Commit 8e5892e2 authored by Bob Lantz's avatar Bob Lantz
Browse files

Make it easier to see what the error was on failed module load.

parent 59d32629
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ def moduleDeps( subtract=None, add=None ): ...@@ -37,7 +37,7 @@ def moduleDeps( subtract=None, add=None ):
info( '*** Removing ' + mod + '\n' ) info( '*** Removing ' + mod + '\n' )
rmmodOutput = rmmod( mod ) rmmodOutput = rmmod( mod )
if rmmodOutput: if rmmodOutput:
error( 'Error removing ' + mod + ': %s\n' % rmmodOutput ) error( 'Error removing ' + mod + ': <%s>\n' % rmmodOutput )
exit( 1 ) exit( 1 )
if mod in lsmod(): if mod in lsmod():
error( 'Failed to remove ' + mod + '; still there!\n' ) error( 'Failed to remove ' + mod + '; still there!\n' )
...@@ -48,7 +48,7 @@ def moduleDeps( subtract=None, add=None ): ...@@ -48,7 +48,7 @@ def moduleDeps( subtract=None, add=None ):
modprobeOutput = modprobe( mod ) modprobeOutput = modprobe( mod )
if modprobeOutput: if modprobeOutput:
error( 'Error inserting ' + mod + '- is it installed?\n' + error( 'Error inserting ' + mod + '- is it installed?\n' +
'Error was: %s\n' % modprobeOutput ) 'Error was: <%s>\n' % modprobeOutput )
if mod not in lsmod(): if mod not in lsmod():
error( 'Failed to insert ' + mod + '\n' ) error( 'Failed to insert ' + mod + '\n' )
exit( 1 ) exit( 1 )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment