From 7f436214bc22ba3969efb2130deef3fb23e6a548 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 19 Oct 2016 13:43:58 +0100 Subject: [PATCH] fix graphical initial-setup on ARM images The old means of enabling the graphical service is obsolete so remove it. It's now detected by explicitly enabling graphical.target so do this by default for all graphical UXes --- fedora-arm-kde.ks | 3 --- fedora-arm-lxde.ks | 3 --- fedora-arm-mate.ks | 3 --- fedora-arm-soas.ks | 3 --- fedora-arm-xbase.ks | 3 +++ fedora-arm-xfce.ks | 3 --- 6 files changed, 3 insertions(+), 15 deletions(-) diff --git a/fedora-arm-kde.ks b/fedora-arm-kde.ks index d85b5db..a64be56 100644 --- a/fedora-arm-kde.ks +++ b/fedora-arm-kde.ks @@ -5,8 +5,5 @@ part / --size=5632 --fstype ext4 %post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . %end diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks index 28a4a74..76ea0de 100644 --- a/fedora-arm-lxde.ks +++ b/fedora-arm-lxde.ks @@ -3,8 +3,5 @@ %include fedora-lxde-packages.ks %post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . %end diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks index d436ac1..c439e09 100644 --- a/fedora-arm-mate.ks +++ b/fedora-arm-mate.ks @@ -5,8 +5,5 @@ part / --size=5500 --fstype ext4 %post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . %end diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks index 3d87a0b..48f267e 100644 --- a/fedora-arm-soas.ks +++ b/fedora-arm-soas.ks @@ -3,8 +3,5 @@ %include fedora-soas-packages.ks %post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . %end diff --git a/fedora-arm-xbase.ks b/fedora-arm-xbase.ks index 91ece50..03a6ae6 100644 --- a/fedora-arm-xbase.ks +++ b/fedora-arm-xbase.ks @@ -10,4 +10,7 @@ # Most of the ARM X accelerated drivers need some level of CMA allocation sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf +# Explicitly set graphical.target as default as this is how initial-setup detects which version to run +ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target + %end diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks index 281fc5e..051ff1b 100644 --- a/fedora-arm-xfce.ks +++ b/fedora-arm-xfce.ks @@ -5,8 +5,5 @@ part / --size=4000 --fstype ext4 %post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . %end