From f9df4bdce624471dc31e5f50e28fc4bd6fe1da7b Mon Sep 17 00:00:00 2001 From: Sundar Date: Tue, 3 Apr 2018 16:25:57 +0530 Subject: [PATCH] Fix for Slitaz distro detection and include Suzuki in contributor list. --- README.md | 3 ++- scripts/distro.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7ee9b84..ff93ac2 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,8 @@ Contributor(s) -------------- Ian Bruce LiQiong Lee -Alin Trăistaru (alindt) +Alin Trăistaru (alindt) +Shinji Suzuki and many others who have given their valuable bug report/ feedback. Author(s) diff --git a/scripts/distro.py b/scripts/distro.py index 6b34cc7..57576eb 100644 --- a/scripts/distro.py +++ b/scripts/distro.py @@ -65,9 +65,6 @@ def distro(iso_cfg_ext_dir, iso_link, expose_exception=False): return "solydx" elif re.search(r'knoppix', string, re.I): 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): return "fedora" 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( 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'lkrn|Nanolinux|OSForensics', string, re.I): + r'lkrn|Nanolinux|OSForensics|acentos', string, re.I): # acentos is a text found in slitaz distro return "slitaz" elif re.search(r'minimal Slackware|Slackware-HOWTO', string, re.I): # for minimal slackware detection @@ -118,6 +115,9 @@ def distro(iso_cfg_ext_dir, iso_link, expose_exception=False): return "zenwalk" elif re.search(r'ubuntu server', string, re.I): 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): return "centos-install" elif re.search(r'CentOS', string, re.I):