Merge branch 'master' of git://projects.archlinux.org/initscripts

2 files changed, 3 insertions, 4 deletions

diff --git a/functions b/functions
index 55815d6..54cac94 100644
--- a/functions
+++ b/functions
@@ -588,8 +588,6 @@ bootlogd_stop() {
 	touch /var/log/boot
 	kill $(< /run/bootlogd.pid)
 	rm -f /run/bootlogd.pid
-	sed -i -r -e 's/\^\[\[[0-9]?;?[0-9]?[0-9]?;?[0-9]?[0-9]?[ms]//g' \
-		  -e 's/\^\[(\[1?[0-9][0-9]|%)G//g' -e 's/\^\[\[0;1//g'  /var/log/boot
 }
 
 ###############################
diff --git a/rc.sysinit b/rc.sysinit
index db4a677..8cdaabf 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -31,8 +31,6 @@ mountpoint -q /dev/shm || mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev
 # log all console messages
 bootlogd -p /run/bootlogd.pid
 
-status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
-
 if [[ ! -e /run/initramfs/root-fsck ]]; then
 	# remount root ro to allow for fsck later on, we remount now to
 	# make sure nothing can open files rw on root which would block a remount
@@ -69,6 +67,9 @@ fi
 # Start/trigger UDev, load MODULES and settle UDev
 udevd_modprobe sysinit
 
+# this must be done after udev has loaded the KMS modules
+status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
+
 # bring up the loopback interface
 [[ -d /sys/class/net/lo ]] &&
 	status "Bringing up loopback interface" ip link set up dev lo