|
 |
ffd6ed |
From 42e5227c61c134bd73b6df0b56f36b68eb59de95 Mon Sep 17 00:00:00 2001
|
|
|
ffd6ed |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
ffd6ed |
Date: Tue, 19 May 2015 16:36:42 +0100
|
|
|
ffd6ed |
Subject: [PATCH] p2v: Force systemd default target to be multi-user (text
|
|
|
ffd6ed |
mode).
|
|
|
ffd6ed |
|
|
|
ffd6ed |
(cherry picked from commit 10cb9b9545424d98687a46c23abdc0e3ff77de76)
|
|
|
ffd6ed |
---
|
|
|
ffd6ed |
p2v/p2v.ks.in | 8 ++++++--
|
|
|
ffd6ed |
p2v/p2v.service | 2 +-
|
|
|
ffd6ed |
p2v/virt-p2v-make-disk.in | 1 +
|
|
|
ffd6ed |
3 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
ffd6ed |
|
|
|
ffd6ed |
diff --git a/p2v/p2v.ks.in b/p2v/p2v.ks.in
|
|
|
ffd6ed |
index 58cca5e..a3b63ab 100644
|
|
|
ffd6ed |
--- a/p2v/p2v.ks.in
|
|
|
ffd6ed |
+++ b/p2v/p2v.ks.in
|
|
|
ffd6ed |
@@ -104,8 +104,6 @@ base64 -d > /etc/systemd/system/p2v.service <
|
|
|
ffd6ed |
__BASE64_P2V_SERVICE__
|
|
|
ffd6ed |
EOF
|
|
|
ffd6ed |
|
|
|
ffd6ed |
-systemctl enable p2v.service
|
|
|
ffd6ed |
-
|
|
|
ffd6ed |
# Base64-decoding of virt-p2v binary
|
|
|
ffd6ed |
# md5(virt-p2v) = __MD5SUM_VIRT_P2V__
|
|
|
ffd6ed |
|
|
|
ffd6ed |
@@ -123,6 +121,12 @@ sed -i 's/^ExecStart=\(.*\)/ExecStart=\1 -a root/' \
|
|
|
ffd6ed |
# Reserve tty1 as a getty so we can document it clearly
|
|
|
ffd6ed |
echo ReserveVT=1 >> /etc/systemd/logind.conf
|
|
|
ffd6ed |
|
|
|
ffd6ed |
+# Force text mode
|
|
|
ffd6ed |
+systemctl set-default multi-user.target
|
|
|
ffd6ed |
+
|
|
|
ffd6ed |
+# Start p2v service
|
|
|
ffd6ed |
+systemctl enable p2v.service
|
|
|
ffd6ed |
+
|
|
|
ffd6ed |
%end
|
|
|
ffd6ed |
|
|
|
ffd6ed |
%post --nochroot
|
|
|
ffd6ed |
diff --git a/p2v/p2v.service b/p2v/p2v.service
|
|
|
ffd6ed |
index 3a8f6ae..4ff055c 100644
|
|
|
ffd6ed |
--- a/p2v/p2v.service
|
|
|
ffd6ed |
+++ b/p2v/p2v.service
|
|
|
ffd6ed |
@@ -28,4 +28,4 @@ ExecStart=/usr/bin/launch-virt-p2v
|
|
|
ffd6ed |
RemainAfterExit=yes
|
|
|
ffd6ed |
|
|
|
ffd6ed |
[Install]
|
|
|
ffd6ed |
-WantedBy=graphical.target
|
|
|
ffd6ed |
+WantedBy=multi-user.target
|
|
|
ffd6ed |
diff --git a/p2v/virt-p2v-make-disk.in b/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
index 28d6e75..316c224 100644
|
|
|
ffd6ed |
--- a/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
+++ b/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
@@ -163,6 +163,7 @@ virt-builder "$osversion" \
|
|
|
ffd6ed |
--chmod 0755:/usr/bin/launch-virt-p2v \
|
|
|
ffd6ed |
--upload "$datadir"/p2v.service:/etc/systemd/system/ \
|
|
|
ffd6ed |
--mkdir /etc/systemd/system/default.target.wants \
|
|
|
ffd6ed |
+ --link /usr/lib/systemd/system/multi-user.target:/etc/systemd/system/default.target \
|
|
|
ffd6ed |
--link /etc/systemd/system/p2v.service:/etc/systemd/system/default.target.wants/p2v.service \
|
|
|
ffd6ed |
--edit '/usr/lib/systemd/system/getty@.service:
|
|
|
ffd6ed |
s/^ExecStart=(.*)/ExecStart=$1 -a root/
|
|
|
ffd6ed |
--
|
|
|
ffd6ed |
1.8.3.1
|
|
|
ffd6ed |
|