From 96c32fbb6a5ffe9835100c38629bb068e224790f Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Mon, 26 Dec 2016 15:14:38 +0000 Subject: boot systemd verbose through systemd config file --- data/live-build-config/hooks/21-systemd_conf.chroot | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 data/live-build-config/hooks/21-systemd_conf.chroot (limited to 'data') diff --git a/data/live-build-config/hooks/21-systemd_conf.chroot b/data/live-build-config/hooks/21-systemd_conf.chroot new file mode 100755 index 00000000..af618a81 --- /dev/null +++ b/data/live-build-config/hooks/21-systemd_conf.chroot @@ -0,0 +1,6 @@ +#!/bin/sh + +echo I: Show systemd statuson boot. + +echo "ShowStatus=yes" >> /etc/systemd/system.conf +echo "SysVConsole=yes" >> /etc/systemd/system.conf -- cgit v1.2.3 From 5126eb75d326d3fc2f1c769e1815fbd244222ba4 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Mon, 26 Dec 2016 15:20:45 +0000 Subject: remove verbose systemd status setting from grub --- .../includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 8 ++++---- scripts/build-clearfog-image | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry index fa02be5b..4107e459 100644 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry +++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry @@ -1,20 +1,20 @@ menuentry "VyOS (KVM console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=ttyS0,9600 console=tty0 + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 initrd /boot//initrd.img } menuentry "VyOS (Serial console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=tty0 console=ttyS0,9600 + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 initrd /boot//initrd.img } menuentry "Lost password change (KVM console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } menuentry "Lost password change (Serial console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } diff --git a/scripts/build-clearfog-image b/scripts/build-clearfog-image index 143ef9cb..0ef6d323 100755 --- a/scripts/build-clearfog-image +++ b/scripts/build-clearfog-image @@ -122,12 +122,12 @@ fi menuentry "VyOS $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live systemd.show_status=1 quiet vyos-union=/boot/"$version" console=ttyS0,115200n8 + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,115200n8 initrd /boot/"$version"/initrd.img } menuentry "Lost password change $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/"$version" console=ttyS0,115200n8 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,115200n8 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } EOF -- cgit v1.2.3 From 52a3899311e92d74dd8bc5caabb095b695223f2c Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Mon, 26 Dec 2016 15:58:30 +0000 Subject: run vyatta-router service before getty service --- .../includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf (limited to 'data') diff --git a/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf b/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf new file mode 100644 index 00000000..7eee7bd3 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf @@ -0,0 +1,2 @@ +[Unit] +After=vyatta-router.service -- cgit v1.2.3