Fix for Slitaz distro detection and include Suzuki in contributor list.

pull/320/head
Sundar 6 years ago
parent 0cca03339c
commit f9df4bdce6

@ -68,7 +68,8 @@ Contributor(s)
-------------- --------------
Ian Bruce Ian Bruce
LiQiong Lee LiQiong Lee
Alin Trăistaru (alindt) Alin Trăistaru (alindt)
Shinji Suzuki
and many others who have given their valuable bug report/ feedback. and many others who have given their valuable bug report/ feedback.
Author(s) Author(s)

@ -65,9 +65,6 @@ def distro(iso_cfg_ext_dir, iso_link, expose_exception=False):
return "solydx" return "solydx"
elif re.search(r'knoppix', string, re.I): elif re.search(r'knoppix', string, re.I):
return "knoppix" return "knoppix"
elif re.search(r'root=live:CDLABEL=CentOS',
string, re.I):
return 'centos' # centos-live
elif re.search(r'root=live:CDLABEL=', string, re.I) or re.search(r'root=live:LABEL=', string, re.I): elif re.search(r'root=live:CDLABEL=', string, re.I) or re.search(r'root=live:LABEL=', string, re.I):
return "fedora" return "fedora"
elif re.search(r'redcore', string, re.I): elif re.search(r'redcore', string, re.I):
@ -77,7 +74,7 @@ def distro(iso_cfg_ext_dir, iso_link, expose_exception=False):
elif re.search( elif re.search(
r'slitaz|dban |ophcrack|tinycore|rescue.cpi|xpud|untangle|4mlinux|partition wizard|android-x86.png|' r'slitaz|dban |ophcrack|tinycore|rescue.cpi|xpud|untangle|4mlinux|partition wizard|android-x86.png|'
r'riplinux|lebel dummy|http://pogostick.net/~pnh/ntpasswd/|AVG Rescue CD|AntivirusLiveCD|' r'riplinux|lebel dummy|http://pogostick.net/~pnh/ntpasswd/|AVG Rescue CD|AntivirusLiveCD|'
r'lkrn|Nanolinux|OSForensics', string, re.I): r'lkrn|Nanolinux|OSForensics|acentos', string, re.I): # acentos is a text found in slitaz distro
return "slitaz" return "slitaz"
elif re.search(r'minimal Slackware|Slackware-HOWTO', string, re.I): elif re.search(r'minimal Slackware|Slackware-HOWTO', string, re.I):
# for minimal slackware detection # for minimal slackware detection
@ -118,6 +115,9 @@ def distro(iso_cfg_ext_dir, iso_link, expose_exception=False):
return "zenwalk" return "zenwalk"
elif re.search(r'ubuntu server', string, re.I): elif re.search(r'ubuntu server', string, re.I):
return "ubuntu-server" return "ubuntu-server"
elif re.search(r'root=live:CDLABEL=CentOS',
string, re.I):
return 'centos' # centos-live
elif re.search(r'Install CentOS', string, re.I): elif re.search(r'Install CentOS', string, re.I):
return "centos-install" return "centos-install"
elif re.search(r'CentOS', string, re.I): elif re.search(r'CentOS', string, re.I):

Loading…
Cancel
Save