From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lakostis@unsafe.ru>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on
 sa.local.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD
 autolearn=ham autolearn_force=no version=3.4.1
Date: Fri, 3 Dec 2021 14:07:20 +0100
From: Konstantin Lepikhov <lakostis@unsafe.ru>
To: devel-distro@lists.altlinux.org
Message-ID: <YaoWiIgypueZrJXm@lks.home>
Mail-Followup-To: devel-distro@lists.altlinux.org
References: <88494e69-2602-4c8f-a8a1-879425ae3ff4@ya.ru>
 <YanUDz83HslM9Dlb@lks.home>
 <499e2651-c1d7-eff1-bb7f-5c8f33525df0@ya.ru>
 <Yann2yatqM1ytWKY@lks.home>
 <97aac25d-a7f5-aaec-a19e-3973be7b8c27@ya.ru>
 <YanuETgR5iWt/dY4@lks.home>
 <ed195425-d20a-213d-b533-f398f8e1e1c7@ya.ru>
 <Yan0QrCfdCF8rSZY@lks.home>
 <a4506bf9-fd7b-3202-916f-6cfb49eadcb2@ya.ru>
 <Yan5paCniqJFU6g9@lks.home>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <Yan5paCniqJFU6g9@lks.home>
X-Operation-System: ALT Sisyphus Sisyphus (unstable) (sisyphus)
 5.10.0-lks-wks-alt13
User-Agent: Mutt/2.1.1.0.3.g6c0f75cca (2021-07-12)
Subject: Re: [devel-distro] Q: virt-install vs vm/builder qcow2
X-BeenThere: devel-distro@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: Distributions development <devel-distro@lists.altlinux.org>
List-Id: Distributions development <devel-distro.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel-distro>,
 <mailto:devel-distro-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel-distro>
List-Post: <mailto:devel-distro@lists.altlinux.org>
List-Help: <mailto:devel-distro-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel-distro>,
 <mailto:devel-distro-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Dec 2021 13:07:25 -0000
Archived-At: <http://lore.altlinux.org/devel-distro/YaoWiIgypueZrJXm@lks.home/>
List-Archive: <http://lore.altlinux.org/devel-distro/>

Hi Konstantin!

On 12/03/2021, at 12:04:05 PM you wrote:

<skip>
> (тут должна появиться текстовая консоль grub но ничего не происходит и
> висит)
Сам нашел, сам и исправил )

diff --git a/conf.d/vm.mk b/conf.d/vm.mk
index 82c991e7..ef774f22 100644
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -24,12 +24,13 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
 # vm/net or vm/systemd-net
 vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm use/tty/S0 \
 	use/net/networkd/resolved
+	@$(call set,KFLAVOURS,centos)
 	@$(call add,THE_KMODULES,drm)
 	@$(call add,VM_INITRDMODULES,sr_mod)
 	@$(call add,BASE_PACKAGES,update-kernel)
 	@$(call add,BASE_PACKAGES,apt-scripts)
 	@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
-	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty0 getty@ttyS0)
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
 
 vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
diff --git a/features.in/tty/config.mk b/features.in/tty/config.mk
index adca3ae1..252e4174 100644
--- a/features.in/tty/config.mk
+++ b/features.in/tty/config.mk
@@ -14,4 +14,4 @@ use/tty/S0 use/tty/SIF0 use/tty/AMA0: use/tty/%: use/tty
 	@$(call add,TTY_DEV,tty$*)
 	@$(call set,TTY_RATE,115200)
 	@$(call add,SYSLINUX_CFG,tty$*)
-	@$(call add,BASE_BOOTARGS,console=tty1 console=$$(TTY_DEV)$(comma)$$(TTY_RATE)n8)
+	@$(call add,BASE_BOOTARGS,console=tty0 console=$$(TTY_DEV)$(comma)$$(TTY_RATE))
diff --git a/features.in/tty/rootfs/image-scripts.d/50-serial b/features.in/tty/rootfs/image-scripts.d/50-serial
index 411fbc18..320f93b6 100755
--- a/features.in/tty/rootfs/image-scripts.d/50-serial
+++ b/features.in/tty/rootfs/image-scripts.d/50-serial
@@ -4,6 +4,7 @@
 BIN=/sbin/agetty
 CFG=/etc/inittab
 SEC=/etc/securetty
+GRUB=/etc/default/grub
 
 [ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
 [ -s "$CFG" -a -x "$BIN" ] || exit 0
@@ -16,3 +17,8 @@ if ! grep -q "$BIN" "$CFG"; then
 		n=$(($n+1))
 	done
 fi
+
+if [ -s "$GRUB" ]; then
+	echo 'GRUB_TERMINAL="serial console"' >> "$GRUB"
+	echo "GRUB_SERIAL_COMMAND=\"serial --speed=$GLOBAL_TTY_RATE --unit=0 --word=8 --parity=no --stop=1\"" >> "$GRUB"
+fi

^ вот это исправление в features.in/tty/rootfs/image-scripts.d/50-serial
для GRUB_TERMINAL и RUB_SERIAL_COMMAND помогло.

-- 
WBR et al.