Добавлена переменная настройки audio для grub-live

pym/builder/builder.py

@@ -1216,6 +1216,7 @@ class Builder(Update):
         """
         proprietary = ["nvidia", "fglrx"]
         video = self.clVars.Get('cl_builder_x11_video_drv')
+        audio = self.clVars.Get('cl_builder_audio')
         locale = self.clVars.Get('cl_builder_locale_lang')
         timezone = self.clVars.Get('cl_builder_timezone')
         params = ["%s:%s" % (CmdlineParams.Locale, locale),
@@ -1230,6 +1231,8 @@ class Builder(Update):
             if current_video == video and video != "default":
                 composite = self.clVars.Get('cl_builder_x11_composite')
                 params.append("%s:%s" % (CmdlineParams.Composite, composite))
+        if audio == "alsa":
+            params.append("audio:alsa")
         calculate_param = ",".join(params)
         if self.clVars.GetBool('cl_builder_docache_set'):
             return "%s docache" % calculate_param

pym/builder/variables/images.py

@@ -25,7 +25,7 @@ from calculate.lib.utils.files import listDirectory
 from calculate.lib.datavars import ReadonlyVariable, HumanReadable, \
     ReadonlyTableVariable, FieldValue, VariableError, Variable, \
     VariableInterface
-from calculate.install.variables import system, X11, locale
+from calculate.install.variables import system, X11, locale, audio
 import builder
 from action import Actions
 
@@ -311,6 +311,18 @@ class VariableClBuilderX11VideoDrv(GrubOptionVariable,
         return map(lambda x: (x, self.driver_names.get(x, x)), values)
 
 
+class VariableClBuilderAudio(GrubOptionVariable, audio.VariableOsAudio):
+    """
+
+    """
+    def get(self):
+        return self.Get('install.os_audio')
+
+    def choice(self):
+        return (('pulseaudio', _("PulseAudio")),
+                ('alsa', _('ALSA')))
+
+
 class VariableClBuilderLocaleLang(GrubOptionVariable,
                                   locale.VariableOsInstallLocaleLang):
     pass

pym/builder/wsdl_builder.py

@@ -279,6 +279,7 @@ class Wsdl(WsdlBase):
                                         'cl_builder_locale_lang',
                                         'cl_builder_timezone',
                                         'cl_builder_x11_video_drv',
+                                        'cl_builder_audio',
                                         'cl_builder_x11_resolution',
                                         'cl_builder_x11_composite',
                                         'cl_builder_docache_set'