[device/accton] Fix accton driver not been installed (#6327)
Accton util applies lsmod to check if drivers are installed. But lsmod may return error on startup and skip module installation. Signed-off-by: Brandon Chuang <brandon_chuang@edge-core.com>
This commit is contained in:
parent
29562d0a4b
commit
c40e43aadb
@ -240,11 +240,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("ls /sys/module/ | grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if not lsmod:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
kos = [
|
kos = [
|
||||||
'depmod -ae',
|
'depmod -ae',
|
||||||
|
@ -145,10 +145,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
kos = [
|
kos = [
|
||||||
|
@ -240,10 +240,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("ls /sys/module | grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -145,10 +145,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -145,10 +145,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("ls /sys/module/ | grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -249,10 +249,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -150,10 +150,11 @@ def log_os_system(cmd, show):
|
|||||||
|
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
(ret, lsmod) = log_os_system('ls /sys/module/ | grep accton', 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:' + lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if not lsmod:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -145,10 +145,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -147,10 +147,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -178,10 +178,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -145,10 +145,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -267,10 +267,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
#'modprobe cpr_4011_4mxx',
|
#'modprobe cpr_4011_4mxx',
|
||||||
|
|
||||||
|
@ -240,10 +240,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
kos = [
|
kos = [
|
||||||
|
@ -248,10 +248,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
def cpld_reset_mac():
|
def cpld_reset_mac():
|
||||||
ret, lsmod = log_os_system("i2cset -y 0 0x77 0x1", 0)
|
ret, lsmod = log_os_system("i2cset -y 0 0x77 0x1", 0)
|
||||||
|
@ -167,10 +167,11 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_check():
|
def driver_check():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -254,10 +254,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
kos = [
|
kos = [
|
||||||
|
@ -181,10 +181,12 @@ def log_os_system(cmd, show):
|
|||||||
return status, output
|
return status, output
|
||||||
|
|
||||||
def driver_inserted():
|
def driver_inserted():
|
||||||
ret, lsmod = log_os_system("lsmod| grep accton", 0)
|
ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
|
||||||
logging.info('mods:'+lsmod)
|
logging.info('mods:'+lsmod)
|
||||||
if len(lsmod) ==0:
|
if ret :
|
||||||
return False
|
return False
|
||||||
|
else :
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user