From bcc7a9683f1b6a6db6d7e336efbbcfa370af555a Mon Sep 17 00:00:00 2001 From: idziubenko Date: Mon, 10 Jan 2022 16:09:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * параметр docache заменен на rd.live.ram=1 --- .../sys-kernel/dracut/80calculate/mount-squashfs.sh | 2 +- .../3.6/6_ac_builder_iso/0_bootmenu/desktop.config | 6 +++--- .../templates/3.6/6_ac_builder_iso/0_bootmenu/server.config | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh index 05e305dd7..996db7420 100755 --- a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh +++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh @@ -11,7 +11,7 @@ live_dir=$(getarg rd.live.dir -d live_dir ) squash_image=$(getarg rd.live.squashimg -d loop) [ -z "$squash_image" ] && squash_image="livecd.squashfs" -getargbool 0 rd.live.ram -d -y live_ram -d -y docache && live_ram="yes" +getargbool 0 rd.live.ram -d -y live_ram -d -y rd.live.ram=1 && live_ram="yes" # we might have an embedded fs image on squashfs (compressed live) if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config index 1eef88a60..32792c5e4 100644 --- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config +++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config @@ -32,13 +32,13 @@ cld-docache; #?pkg(sys-kernel/dracut)==#root=/dev/ram0#!pkg#root=#-cl_builder_root_param-##pkg#; /boot/initrd; #?pkg(media-gfx/splashutils)!=# -#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 docache; +#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 rd.live.ram=1; #pkg# #?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=# -#-load(/bootmenu/bootparam.config)-# splash docache; +#-load(/bootmenu/bootparam.config)-# splash rd.live.ram=1; #pkg# #?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==# -#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose docache; +#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose rd.live.ram=1; #pkg# cld-nox; diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config index ee3d4a8a8..109629515 100644 --- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config +++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config @@ -24,13 +24,13 @@ cds-docache; #?pkg(sys-kernel/dracut)==#root=/dev/ram0#!pkg#root=#-cl_builder_root_param-##pkg#; /boot/initrd; #?pkg(media-gfx/splashutils)!=# -#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 docache; +#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 rd.live.ram=1; #pkg# #?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=# -#-load(/bootmenu/bootparam.config)-# splash docache; +#-load(/bootmenu/bootparam.config)-# splash rd.live.ram=1; #pkg# #?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==# -#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose docache; +#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose rd.live.ram=1; #pkg# #?pkg(media-gfx/splash-themes-calculate)!=#