parent
508510d90e
commit
b69d506fa8
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The WSDL core for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.1.7
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
dev-python/m2crypto
|
||||
dev-python/cherrypy )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||
einfo " cl-core --bootstrap <username>"
|
||||
einfo "For run calculate-core perform:"
|
||||
einfo " /etc/init.d/calculate-core start"
|
||||
einfo "Add calcualte core to autorun:"
|
||||
einfo " rc-update add calculate-core boot"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-core-3.1.7-r6.patch"
|
||||
}
|
||||
@ -0,0 +1,125 @@
|
||||
diff --git core/server/api_types.py core/server/api_types.py
|
||||
index 8161a9e..0bca760 100644
|
||||
--- core/server/api_types.py
|
||||
+++ core/server/api_types.py
|
||||
@@ -359,7 +359,7 @@ class ViewInfo(DataVarsSerializer):
|
||||
varGroups = datavars.getGroups()
|
||||
lastGroup = len(varGroups)-1
|
||||
# interate all vars group
|
||||
- if not onlyhelp and (step in(0,-1,None) or allsteps):
|
||||
+ if step in(0,-1,None) or allsteps:
|
||||
briefData = datavars.getBrief()
|
||||
self.groups.append(self.stepGroup(varGroups,brief_label,
|
||||
help_value=briefData.get("help",None),
|
||||
diff --git core/server/func.py core/server/func.py
|
||||
index fdee9d5..be7c323 100644
|
||||
--- core/server/func.py
|
||||
+++ core/server/func.py
|
||||
@@ -1659,7 +1659,7 @@ class WsdlBase:
|
||||
def clearDataVars(func):
|
||||
def wrapper(*args,**kwargs):
|
||||
try:
|
||||
- func(*args,**kwargs)
|
||||
+ return func(*args,**kwargs)
|
||||
finally:
|
||||
WsdlMeta.closeDataVars()
|
||||
return wrapper
|
||||
diff --git core/server/methods_func.py core/server/methods_func.py
|
||||
index d546c1f..72014a2 100644
|
||||
--- core/server/methods_func.py
|
||||
+++ core/server/methods_func.py
|
||||
@@ -501,10 +501,10 @@ def collect_object(client, param_object, view, args,wait_thread = None,
|
||||
val)
|
||||
|
||||
elif field.element in ['input', 'openfile',\
|
||||
- 'file', 'radio']:
|
||||
+ 'file', 'radio','combo','comboEdit']:
|
||||
param_object = set_obj_item(client, param_object, field.name,
|
||||
_getattr(args, field.name))
|
||||
- elif field.element in ['password'] and _getattr(args, field.name) \
|
||||
+ elif 'passwd' in field.element and _getattr(args, field.name) \
|
||||
or field.type and "need" in field.type:
|
||||
if wait_thread:
|
||||
wait_thread.pause()
|
||||
@@ -517,21 +517,6 @@ def collect_object(client, param_object, view, args,wait_thread = None,
|
||||
password)
|
||||
if wait_thread:
|
||||
wait_thread.resume()
|
||||
- elif field.element in ['combo', 'comboEdit']:
|
||||
- value = _getattr(args, field.name)
|
||||
- if value:
|
||||
- if hasattr (field.choice, 'string'):
|
||||
- choice = field.choice.string
|
||||
- else:
|
||||
- choice = field.choice
|
||||
- for item in choice:
|
||||
- if item:
|
||||
- if value.lower() == item.lower():
|
||||
- value = item
|
||||
- break
|
||||
-
|
||||
- param_object = set_obj_item(client, param_object, field.name,
|
||||
- value)
|
||||
elif field.element in ['multichoice', 'multichoice_add', \
|
||||
'selecttable', 'selecttable_add']:
|
||||
val = _getattr(args, field.name)
|
||||
diff --git core/server/replace_class.py core/server/replace_class.py
|
||||
index 860ede2..02ea194 100644
|
||||
--- core/server/replace_class.py
|
||||
+++ core/server/replace_class.py
|
||||
@@ -515,7 +515,7 @@ def call_method(metaObject, args, unknown_args, colorPrint):
|
||||
view_obj.step = None
|
||||
view_obj.expert = True
|
||||
view_obj.brief = None
|
||||
- view_obj.onlyhelp = False
|
||||
+ view_obj.onlyhelp = True
|
||||
|
||||
try:
|
||||
view = getattr(metaObject, method_view_name)(0, view_obj)
|
||||
diff --git core/utils/cl_core_setup.py core/utils/cl_core_setup.py
|
||||
index 7d84869..900a213 100644
|
||||
--- core/utils/cl_core_setup.py
|
||||
+++ core/utils/cl_core_setup.py
|
||||
@@ -31,7 +31,7 @@ class ClCoreSetupAction(Action):
|
||||
# ошибки, которые отображаются без подробностей
|
||||
native_error = (FilesError,TemplatesError,VariableError,DataVarsError)
|
||||
templateTaskMessage = __("System are being configured")
|
||||
- successMessage = __("System configured!")
|
||||
+ successMessage = None
|
||||
failedMessage = __("Failed to configure the system!")
|
||||
interruptMessage = __("Configuration manually interrupted")
|
||||
|
||||
@@ -66,6 +66,7 @@ class ClCoreSetupAction(Action):
|
||||
'cl_template_path_use,cl_ebuild_phase,'
|
||||
'cl_template_clt_set)',
|
||||
'condition':lambda dv:(dv.Get('cl_core_pkg_desktop_set') == 'on' and
|
||||
+ dv.isModuleInstalled('desktop') and
|
||||
not dv.Get('cl_ebuild_phase') in ("preinst","prerm"))
|
||||
}
|
||||
]
|
||||
diff --git core/utils/cl_core_variables.py core/utils/cl_core_variables.py
|
||||
index 38c3dfd..d0c5ef3 100644
|
||||
--- core/utils/cl_core_variables.py
|
||||
+++ core/utils/cl_core_variables.py
|
||||
@@ -31,7 +31,7 @@ class ClCoreVariables(Action):
|
||||
native_error = (FilesError,DataVarsError,VariableError)
|
||||
successMessage = None
|
||||
failedMessage = None
|
||||
- interruptMessage = __("Setting manually interrupted")
|
||||
+ interruptMessage = __("Variables modification manually interrupted")
|
||||
|
||||
tasks = [
|
||||
{'name':'write_vars',
|
||||
diff --git core/variables/certificate.py core/variables/certificate.py
|
||||
index a9efbb5..4511ff6 100644
|
||||
--- core/variables/certificate.py
|
||||
+++ core/variables/certificate.py
|
||||
@@ -165,7 +165,7 @@ class VariableClCertPerms(Variable):
|
||||
return results
|
||||
|
||||
def uncompatible(self):
|
||||
- return _('You can not change the certificate certificate')
|
||||
+ return _('You can not change the certificate permissions')
|
||||
|
||||
class VariableClCertGroups(Variable):
|
||||
"""
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.7
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
>=virtual/udev-197
|
||||
!app-misc/livecd-tools
|
||||
sys-apps/iproute2[-minimal]
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )
|
||||
pxe? ( sys-apps/calculate-server
|
||||
net-ftp/tftp-hpa
|
||||
net-misc/dhcp
|
||||
net-fs/nfs-utils )"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.7-r5.patch"
|
||||
}
|
||||
@ -0,0 +1,316 @@
|
||||
diff --git install/distr.py install/distr.py
|
||||
index be23d8e..545168b 100644
|
||||
--- install/distr.py
|
||||
+++ install/distr.py
|
||||
@@ -458,7 +458,7 @@ class Distributive(object):
|
||||
PartitionDistributive:"partdir"}
|
||||
extname = mapExtName.get(distr.__class__,"")
|
||||
image = distr.convertToDirectory()
|
||||
- except Exception,e:
|
||||
+ except Exception as e:
|
||||
if distr:
|
||||
distr.close()
|
||||
return {}.copy()
|
||||
diff --git install/install.py install/install.py
|
||||
index 9456d36..3ae3eb9 100644
|
||||
--- install/install.py
|
||||
+++ install/install.py
|
||||
@@ -400,7 +400,7 @@ class Install:
|
||||
'lvm_vgname' название группы томов LVM, bios_grub - создавать
|
||||
bios_grub раздел
|
||||
"""
|
||||
- ap = Autopartition()
|
||||
+ ap = AutoPartition()
|
||||
ap.clearLvm(devices,self.clVars)
|
||||
ap.clearRaid(devices,self.clVars)
|
||||
ap.recreateSpace(table,devices,data,lvm,lvm_vgname,bios_grub)
|
||||
diff --git install/utils/cl_setup.py install/utils/cl_setup.py
|
||||
index 39b8ba6..c5622dc 100644
|
||||
--- install/utils/cl_setup.py
|
||||
+++ install/utils/cl_setup.py
|
||||
@@ -25,19 +25,48 @@ from calculate.install.install import (MigrationError, TemplatesError,
|
||||
setLocalTranslate('cl_install3',sys.modules[__name__])
|
||||
__ = getLazyLocalTranslate(_)
|
||||
|
||||
-class ClSetupSystemAction(Action):
|
||||
+class ClSetupVideoAction(Action):
|
||||
"""
|
||||
- Объект настройки всех параметров системы
|
||||
+ Действие для настройки параметров видео
|
||||
"""
|
||||
# ошибки, которые отображаются без подробностей
|
||||
native_error = (FilesError,MigrationError, TemplatesError,
|
||||
InstallError, AutopartitionError, DistributiveError)
|
||||
- addon_tasks = []
|
||||
- templateTaskMessage = __("System are being configured")
|
||||
- successMessage = __("System configured!")
|
||||
- failedMessage = __("Failed to configure the system!")
|
||||
+
|
||||
+ templateTaskMessage = __("Video settings are being configured")
|
||||
+ successMessage = __("Video settings configured!")
|
||||
+ failedMessage = __("Failed to configure the video settings!")
|
||||
interruptMessage = __("Configuration manually interrupted")
|
||||
|
||||
+ addon_tasks = [
|
||||
+ # проверить и настроить параметры для nvidia драйвера
|
||||
+ {'name':'check_video',
|
||||
+ 'message':__("Checking the video driver"),
|
||||
+ 'method':'Install.checkVideoDriver()',
|
||||
+ },
|
||||
+ {'name':'setup_opengl',
|
||||
+ 'message':__("Configuring OpenGL"),
|
||||
+ 'method':'Install.setupOpenGL()',
|
||||
+ },
|
||||
+ {'name':'reboot',
|
||||
+ 'warning':__("To apply the changes, reboot the system"),
|
||||
+ 'condition': lambda dv:(dv.Get('os_x11_video_drv') != \
|
||||
+ dv.Get('os_install_x11_video_drv') and \
|
||||
+ (dv.Get('os_x11_video_drv') in dv.Get('os_x11_kms_video_drv') \
|
||||
+ or dv.Get('os_install_x11_video_drv') \
|
||||
+ in dv.Get('os_x11_kms_video_drv')))
|
||||
+ },
|
||||
+ {'name':'restart',
|
||||
+ 'warning':__("To apply the changes, restart the X server"),
|
||||
+ 'condition': lambda dv:(dv.Get('os_x11_video_drv') !=
|
||||
+ dv.Get('os_install_x11_video_drv') and
|
||||
+ (not dv.Get('os_x11_video_drv') in
|
||||
+ dv.Get('os_x11_kms_video_drv') and
|
||||
+ not dv.Get('os_install_x11_video_drv')
|
||||
+ in dv.Get('os_x11_kms_video_drv')))
|
||||
+ }
|
||||
+ ]
|
||||
+
|
||||
def __init__(self):
|
||||
# список задач для дейсвия
|
||||
self.tasks = [
|
||||
@@ -52,10 +81,20 @@ class ClSetupSystemAction(Action):
|
||||
self.tasks.extend(self.addon_tasks)
|
||||
Action.__init__(self)
|
||||
|
||||
+
|
||||
+class ClSetupSystemAction(ClSetupVideoAction):
|
||||
+ """
|
||||
+ Объект настройки всех параметров системы
|
||||
+ """
|
||||
+ templateTaskMessage = __("System are being configured")
|
||||
+ successMessage = __("System configured!")
|
||||
+ failedMessage = __("Failed to configure the system!")
|
||||
+
|
||||
class ClSetupAudioAction(ClSetupSystemAction):
|
||||
"""
|
||||
Действие для настройки аудио параметров
|
||||
"""
|
||||
+ addon_tasks = []
|
||||
templateTaskMessage = __("Audio settings are being configured")
|
||||
successMessage = __("Audio settings configured!")
|
||||
failedMessage = __("Failed to configure the audio parameters!")
|
||||
@@ -64,6 +103,7 @@ class ClSetupLocaleAction(ClSetupSystemAction):
|
||||
"""
|
||||
Действие для настройки языковых параметров
|
||||
"""
|
||||
+ addon_tasks = []
|
||||
templateTaskMessage = \
|
||||
__("Localization and time options are being configured")
|
||||
successMessage = __("System configured!")
|
||||
@@ -73,6 +113,7 @@ class ClSetupNetworkAction(ClSetupSystemAction):
|
||||
"""
|
||||
Действие для настройки аудио параметров
|
||||
"""
|
||||
+ addon_tasks = []
|
||||
templateTaskMessage = __("Network settings are being configured")
|
||||
successMessage = __("Network settings configured!")
|
||||
failedMessage = __("Failed to configure the network settings!")
|
||||
@@ -81,6 +122,7 @@ class ClSetupUsersAction(ClSetupSystemAction):
|
||||
"""
|
||||
Действие для настройки пользовательских параметров
|
||||
"""
|
||||
+ addon_tasks = []
|
||||
templateTaskMessage = __("User settings are being configured")
|
||||
successMessage = __("User settings configured!")
|
||||
failedMessage = __("Failed to configure the user settings!")
|
||||
@@ -98,53 +140,17 @@ class ClSetupBootAction(ClSetupSystemAction):
|
||||
{'name':'prepare_bootloader',
|
||||
'message':_("Installing the bootloader"),
|
||||
'method':'Install.prepareBoot(cl_image)',
|
||||
- 'condition':(lambda dv:dv.Get('os_install_mbr') or
|
||||
- dv.Get('os_install_uefi_set') == 'on')
|
||||
+ 'condition':(lambda Get:(Get('os_install_mbr') or
|
||||
+ Get('os_install_uefi_set') == 'on') and
|
||||
+ Get('os_root_type') != 'livecd')
|
||||
},
|
||||
# изменить IO планировщик
|
||||
{'name':'change_ioscheduler',
|
||||
'message':_("Changing the I/O scheduler"),
|
||||
'method':'Install.changeScheduler(os_install_kernel_scheduler)',
|
||||
- 'condition':(lambda dv:dv.Select('os_disk_parent',
|
||||
+ 'condition':(lambda dv:dv.Get('os_root_type') != 'livecd' and
|
||||
+ dv.Select('os_disk_parent',
|
||||
where='os_disk_mount',
|
||||
eq='/',limit=1))
|
||||
},
|
||||
]
|
||||
-
|
||||
-class ClSetupVideoAction(ClSetupSystemAction):
|
||||
- """
|
||||
- Действие для настройки параметров видео
|
||||
- """
|
||||
- templateTaskMessage = __("Video settings are being configured")
|
||||
- successMessage = __("Video settings configured!")
|
||||
- failedMessage = __("Failed to configure the video settings!")
|
||||
-
|
||||
- addon_tasks = [
|
||||
- # проверить и настроить параметры для nvidia драйвера
|
||||
- {'name':'check_video',
|
||||
- 'message':__("Checking the video driver"),
|
||||
- 'method':'Install.checkVideoDriver()',
|
||||
- },
|
||||
- {'name':'setup_opengl',
|
||||
- 'message':__("Configuring OpenGL"),
|
||||
- 'method':'Install.setupOpenGL()',
|
||||
- },
|
||||
- {'name':'reboot',
|
||||
- 'warning':__("To apply the changes, reboot the system"),
|
||||
- 'condition': lambda dv:(dv.Get('os_x11_video_drv') != \
|
||||
- dv.Get('os_install_x11_video_drv') and \
|
||||
- (dv.Get('os_x11_video_drv') in dv.Get('os_x11_kms_video_drv') \
|
||||
- or dv.Get('os_install_x11_video_drv') \
|
||||
- in dv.Get('os_x11_kms_video_drv')))
|
||||
- },
|
||||
- {'name':'restart',
|
||||
- 'warning':__("To apply the changes, restart the X server"),
|
||||
- 'condition': lambda dv:(dv.Get('os_x11_video_drv') !=
|
||||
- dv.Get('os_install_x11_video_drv') and
|
||||
- (not dv.Get('os_x11_video_drv') in
|
||||
- dv.Get('os_x11_kms_video_drv') and
|
||||
- not dv.Get('os_install_x11_video_drv')
|
||||
- in dv.Get('os_x11_kms_video_drv')))
|
||||
- }
|
||||
- ]
|
||||
-
|
||||
diff --git install/variables/X11.py install/variables/X11.py
|
||||
index cd8ef73..3634b02 100644
|
||||
--- install/variables/X11.py
|
||||
+++ install/variables/X11.py
|
||||
@@ -26,6 +26,7 @@ from calculate.lib.utils.common import (getVideoFromXorgLog,
|
||||
getAvailableVideo, getValueFromCmdLine,
|
||||
getCompositeFromXorgconf, getVideoFromModules,
|
||||
getVideoFromVendor,getInstalledVideo)
|
||||
+from calculate.install.distr import DistributiveError
|
||||
|
||||
from calculate.lib.cl_lang import setLocalTranslate
|
||||
setLocalTranslate('cl_install3',sys.modules[__name__])
|
||||
@@ -109,10 +110,13 @@ class VariableOsInstallX11VideoAvailable(VideoVariable):
|
||||
image = self.Get('cl_image')
|
||||
if image:
|
||||
with image as distr:
|
||||
- distrPath = image.getDirectory()
|
||||
- if isPkgInstalled('xorg-server',prefix=distrPath):
|
||||
- return sorted(filter(self.supported.__contains__,
|
||||
- getAvailableVideo(prefix=distrPath)))+['other']
|
||||
+ try:
|
||||
+ distrPath = image.getDirectory()
|
||||
+ if isPkgInstalled('xorg-server',prefix=distrPath):
|
||||
+ return sorted(filter(self.supported.__contains__,
|
||||
+ getAvailableVideo(prefix=distrPath)))+['other']
|
||||
+ except DistributiveError as e:
|
||||
+ pass
|
||||
return []
|
||||
|
||||
class VariableOsX11KmsVideoDrv(ReadonlyVariable):
|
||||
diff --git install/variables/kernel.py install/variables/kernel.py
|
||||
index 9f8c395..2e844ac 100644
|
||||
--- install/variables/kernel.py
|
||||
+++ install/variables/kernel.py
|
||||
@@ -30,6 +30,7 @@ from calculate.lib.utils.common import (getKernelUid,getTupleVersion,
|
||||
getValueFromCmdLine)
|
||||
from calculate.lib.utils.device import getUdevDeviceInfo
|
||||
from itertools import *
|
||||
+from calculate.install.distr import DistributiveError
|
||||
|
||||
class VariableOsInstallKernelScheduler(Variable):
|
||||
"""
|
||||
@@ -85,11 +86,14 @@ class VariableOsInstallKernelBfqSet(ReadonlyVariable):
|
||||
image = self.Get('cl_image')
|
||||
if image:
|
||||
with image as distr:
|
||||
- distrPath = image.getDirectory()
|
||||
- kernelConfig = path.join(distrPath,"usr/src/linux/.config")
|
||||
- if filter(lambda x:"CONFIG_IOSCHED_BFQ=y" in x,
|
||||
- readLinesFile(kernelConfig)):
|
||||
- return "on"
|
||||
+ try:
|
||||
+ distrPath = image.getDirectory()
|
||||
+ kernelConfig = path.join(distrPath,"usr/src/linux/.config")
|
||||
+ if filter(lambda x:"CONFIG_IOSCHED_BFQ=y" in x,
|
||||
+ readLinesFile(kernelConfig)):
|
||||
+ return "on"
|
||||
+ except DistributiveError as e:
|
||||
+ return "off"
|
||||
return "off"
|
||||
|
||||
class VariableOsInstallKernelAttr(Variable):
|
||||
diff --git install/variables/net.py install/variables/net.py
|
||||
index a7f2df2..d5cec22 100644
|
||||
--- install/variables/net.py
|
||||
+++ install/variables/net.py
|
||||
@@ -35,6 +35,7 @@ from calculate.lib.utils.portage import isPkgInstalled
|
||||
from operator import itemgetter
|
||||
from itertools import *
|
||||
import hashlib
|
||||
+from calculate.install.distr import DistributiveError
|
||||
|
||||
class NetHelper:
|
||||
"""
|
||||
@@ -649,11 +650,14 @@ class VariableOsInstallNetConfAvailable(NetHelper,Variable):
|
||||
image = self.Get('cl_image')
|
||||
if image:
|
||||
with image as distr:
|
||||
- distrPath = image.getDirectory()
|
||||
- return map(itemgetter(0,2),
|
||||
- filter(lambda x:not x[1] or isPkgInstalled(x[1],
|
||||
- prefix=distrPath),
|
||||
- mapNetConf))
|
||||
+ try:
|
||||
+ distrPath = image.getDirectory()
|
||||
+ return map(itemgetter(0,2),
|
||||
+ filter(lambda x:not x[1] or isPkgInstalled(x[1],
|
||||
+ prefix=distrPath),
|
||||
+ mapNetConf))
|
||||
+ except DistributiveError as e:
|
||||
+ pass
|
||||
return sorted(map(itemgetter(0,2),mapNetConf[-1:]),key=itemgetter(1))
|
||||
|
||||
class VariableOsInstallNetConf(NetHelper,Variable):
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index dd5a974..c54bd87 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -25,7 +25,7 @@ from calculate.install.fs_manager import FileSystemManager
|
||||
from calculate.lib.utils.files import (readFile,getProgPath,process,
|
||||
readLinesFile)
|
||||
from calculate.lib.utils.common import getPasswdUsers,getUserGroups,getGroups
|
||||
-from calculate.lib.utils.common import getValueFromConfig
|
||||
+from calculate.lib.utils.common import getValueFromConfig,getValueFromCmdLine
|
||||
from calculate.lib.utils.portage import isPkgInstalled
|
||||
from calculate.lib.utils.device import getUdevDeviceInfo
|
||||
from crypt import crypt
|
||||
@@ -319,7 +319,10 @@ class VariableClAutologin(UserHelper,Variable):
|
||||
|
||||
def get(self):
|
||||
# autologin enable for livecd and all install type CMC
|
||||
- if self.Get('os_install_root_type') == "livecd" or \
|
||||
+ cmdDomainSet = (getValueFromCmdLine("calculate","domain_pw") or
|
||||
+ getValueFromCmdLine("calculate","domain") or "")
|
||||
+ if (not cmdDomainSet and
|
||||
+ self.Get('os_install_root_type') == "livecd" ) or \
|
||||
self.Get('os_install_linux_shortname') == "CMC":
|
||||
nonRootUsers = filter(lambda x: x != "root",
|
||||
self.Get('cl_migrate_user'))
|
||||
@@ -766,6 +769,6 @@ class VariableOsAudioDefault(Variable):
|
||||
"""
|
||||
Audio setting up unavailable for flash installation
|
||||
"""
|
||||
- if self.Get('os_install_root_type') != 'flash':
|
||||
+ if self.Get('os_install_root_type') == 'flash':
|
||||
return _("Audio configuration unavailable for Flash install")
|
||||
return ""
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.7-r5
|
||||
=sys-apps/calculate-i18n-3.1.7
|
||||
=sys-apps/calculate-lib-3.1.7-r1
|
||||
=sys-apps/calculate-core-3.1.7-r6
|
||||
=sys-apps/calculate-update-3.1.7
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.7-r2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.7 )
|
||||
"
|
||||
Loading…
Reference in new issue