From 916b5449c37b0b07930238e7651d84ab7d79a44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 3 Oct 2018 14:17:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D1=81?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D0=B7?= =?UTF-8?q?=D0=B2=D1=83=D0=BA=D0=BE=D0=B2=D0=BE=D0=B9=20=D1=81=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D0=BC=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D1=81=20live=20UEFI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../5_setup/sys-boot/grub/audio.cfg | 16 ++++++++++++++++ .../5_setup/sys-boot/grub/grub.cfg | 8 ++++++++ 2 files changed, 24 insertions(+) create mode 100644 profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/audio.cfg diff --git a/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/audio.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/audio.cfg new file mode 100644 index 000000000..632a954f8 --- /dev/null +++ b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/audio.cfg @@ -0,0 +1,16 @@ + +function commonaudio { + echo "Switching to: $1" + set bootaudio=$2 + export bootaudio + configfile /boot/grub/grub.cfg +} + +submenu "Audio Selection" { + menuentry "ALSA" { + commonaudio "$chosen" alsa + } + menuentry "PulseAudio" { + commonaudio "$chosen" pulseaudio + } +} diff --git a/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg index e90b63709..abb7f638d 100644 --- a/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg +++ b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg @@ -10,6 +10,7 @@ echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Timezone: ${boottimezone}" + echo "Audio: ${bootaudio}" echo "Bootparams: ${bootparams}" echo "Please wait..." linux \3 \4 \6 ${bootparams} ${noefi_opt} ${no_gfxmode} @@ -93,6 +94,12 @@ then fi bootparams=${bootparams}, +if [ x$bootaudio != x ] +then + bootparams=${bootparams}audio:${bootaudio} +fi +bootparams=${bootparams}, + if [ x$boottimezone != x ] then bootparams=${bootparams}timezone:${boottimezone} @@ -155,6 +162,7 @@ if [ x$no_gfxmode = x ]; then else source /boot/grub/lang_nogfx.cfg fi +source /boot/grub/audio.cfg source /boot/grub/timezone.cfg #?os_builder_linux_system==desktop# source /boot/grub/video.cfg