cliconfig: Remove --preferred-distros
It's less relevant with our new search based OS list
This commit is contained in:
parent
e6738d9827
commit
c9f0641700
5
setup.py
5
setup.py
|
@ -321,8 +321,6 @@ class configure(distutils.core.Command):
|
|||
"(default=none)"),
|
||||
("askpass-package-names=", None,
|
||||
"name of your distro's askpass package(s) (default=none)"),
|
||||
("preferred-distros=", None,
|
||||
"Distros to list first in the New VM wizard (default=none)"),
|
||||
("stable-defaults", None,
|
||||
"Hide config bits that are not considered stable (default=no)"),
|
||||
("default-graphics=", None,
|
||||
|
@ -342,7 +340,6 @@ class configure(distutils.core.Command):
|
|||
self.libvirt_package_names = None
|
||||
self.kvm_package_names = None
|
||||
self.askpass_package_names = None
|
||||
self.preferred_distros = None
|
||||
self.stable_defaults = None
|
||||
self.default_graphics = None
|
||||
self.default_hvs = None
|
||||
|
@ -358,8 +355,6 @@ class configure(distutils.core.Command):
|
|||
template += "hv_packages = %s\n" % self.kvm_package_names
|
||||
if self.askpass_package_names is not None:
|
||||
template += "askpass_packages = %s\n" % self.askpass_package_names
|
||||
if self.preferred_distros is not None:
|
||||
template += "preferred_distros = %s\n" % self.preferred_distros
|
||||
if self.stable_defaults is not None:
|
||||
template += ("stable_defaults = %s\n" %
|
||||
self.stable_defaults)
|
||||
|
|
|
@ -10,11 +10,9 @@
|
|||
%global askpass_package "openssh-askpass"
|
||||
%global libvirt_packages "libvirt-daemon-kvm,libvirt-daemon-config-network"
|
||||
%global kvm_packages ""
|
||||
%global preferred_distros "fedora,rhel"
|
||||
%global default_hvs "qemu,xen,lxc"
|
||||
|
||||
%if 0%{?rhel}
|
||||
%global preferred_distros "rhel,fedora"
|
||||
%global stable_defaults 1
|
||||
%endif
|
||||
|
||||
|
@ -113,10 +111,6 @@ machine).
|
|||
%global _kvm_packages --kvm-package-names=%{kvm_packages}
|
||||
%endif
|
||||
|
||||
%if %{preferred_distros}
|
||||
%global _preferred_distros --preferred-distros=%{preferred_distros}
|
||||
%endif
|
||||
|
||||
%if %{libvirt_packages}
|
||||
%global _libvirt_packages --libvirt-package-names=%{libvirt_packages}
|
||||
%endif
|
||||
|
@ -137,7 +131,6 @@ machine).
|
|||
%{?_kvm_packages} \
|
||||
%{?_libvirt_packages} \
|
||||
%{?_askpass_package} \
|
||||
%{?_preferred_distros} \
|
||||
%{?_stable_defaults} \
|
||||
%{?_default_hvs}
|
||||
|
||||
|
|
|
@ -175,7 +175,6 @@ class vmmConfig(object):
|
|||
# the keyring
|
||||
self.keyring = None
|
||||
|
||||
self.preferred_distros = CLIConfig.preferred_distros
|
||||
self.hv_packages = CLIConfig.hv_packages
|
||||
self.libvirt_packages = CLIConfig.libvirt_packages
|
||||
self.askpass_package = CLIConfig.askpass_package
|
||||
|
|
|
@ -72,8 +72,6 @@ class _CLIConfig(object):
|
|||
|
||||
self.stable_defaults = bool(int(_get_param("stable_defaults", "0")))
|
||||
|
||||
self.preferred_distros = _split_list(
|
||||
_get_param("preferred_distros", ""))
|
||||
self.hv_packages = _split_list(_get_param("hv_packages", ""))
|
||||
self.askpass_package = _split_list(_get_param("askpass_packages", ""))
|
||||
self.libvirt_packages = _split_list(_get_param("libvirt_packages", ""))
|
||||
|
|
Loading…
Reference in New Issue