Fix image preparation issue for debian

This commit is contained in:
lizzha 2015-10-21 12:41:50 +08:00
Родитель 0462ba5284
Коммит 1cbd63ffb5
3 изменённых файлов: 3 добавлений и 2 удалений

Просмотреть файл

@ -192,7 +192,7 @@ def install_package(package):
if (package == "ez_setup"):
return install_ez_setup()
else:
if ((current_distro == "ubuntu") or (current_distro == "Debian")):
if ((current_distro == "ubuntu") or (current_distro == "debian")):
return AptgetPackageInstall(package)
elif ((current_distro == "rhel") or (current_distro == "Oracle") or (current_distro == 'centos') or (current_distro == 'fedora')):
return yum_package_install(package)

Просмотреть файл

@ -42,7 +42,7 @@ ResultLog.addHandler(WResultLog)
def UpdateRepos(current_distro):
RunLog.info ("\nUpdating the repositoriy information...")
if ((current_distro == "ubuntu") or (current_distro == "Debian")):
if ((current_distro == "ubuntu") or (current_distro == "debian")):
#method 'RunUpdate': fix deadlock when using stdout=PIPE and/or stderr=PIPE and the child process generates enough output to a pipe
RunUpdate("apt-get update")
elif ((current_distro == "rhel") or (current_distro == "Oracle") or (current_distro == 'centos')):

Просмотреть файл

@ -1,6 +1,7 @@
<!--#This list contains packages tobe installed separate each package name with space or tab or multiple number of spaces.-->
<setup>
<branch>
<packages distro="debian">iperf,mysql-server,gcc,bind9,python-crypto,python-paramiko,nfs-common,psmisc,tcpdump,ntp,libaio1,xfsprogs</packages>
<packages distro="ubuntu">iperf,mysql-server,gcc,bind9,python-crypto,python-paramiko,nfs-common,psmisc,tcpdump,ntp,libaio1,xfsprogs</packages>
<packages distro="SUSE">iperf,mysql,gcc,bind,python,python-argparse,python-paramiko,nfs-kernel-server,psmisc,tcpdump,ntp,libaio,xfsprogs</packages>
<packages distro="sles">iperf,mysql,gcc,bind,python,python-argparse,python-paramiko,nfs-kernel-server,psmisc,tcpdump,ntp,libaio,xfsprogs</packages>