[spin-kickstarts/f21] live base: Install fedora-release-nonproduct for non-product lives
by Kalev Lember
commit b9dc5f25e9ef7aa845c0f076a21c200ff0f596cb
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Oct 18 15:30:49 2014 +0200
live base: Install fedora-release-nonproduct for non-product lives
Add fedora-release-nonproduct to fedora-live-base.ks to ensure it gets
pulled in for all spins. In order to avoid it getting pulled in to
the Workstation product that is also based on fedora-live-base.ks,
explicitly exclude fedora-release-nonproduct in workstation kickstart
file.
https://bugzilla.redhat.com/show_bug.cgi?id=1154235
fedora-live-base.ks | 1 +
fedora-workstation-packages.ks | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index a7d50a9..8c4899d 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -24,6 +24,7 @@ services --enabled=NetworkManager --disabled=network,sshd
@guest-desktop-agents
@standard
@core
+@fedora-release-nonproduct
@fonts
@input-methods
@dial-up
diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index fafac1d..ec46a1d 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -2,6 +2,7 @@
# Exclude unwanted groups that fedora-live-base.ks pulls in
-@dial-up
+-@fedora-release-nonproduct
-@input-methods
-@standard
9 years, 5 months
[spin-kickstarts] live base: Install fedora-release-nonproduct for non-product lives
by Kalev Lember
commit bfa7d4e4f614a289ee04936371202cb66f11303d
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Oct 18 15:30:49 2014 +0200
live base: Install fedora-release-nonproduct for non-product lives
Add fedora-release-nonproduct to fedora-live-base.ks to ensure it gets
pulled in for all spins. In order to avoid it getting pulled in to
the Workstation product that is also based on fedora-live-base.ks,
explicitly exclude fedora-release-nonproduct in workstation kickstart
file.
https://bugzilla.redhat.com/show_bug.cgi?id=1154235
fedora-live-base.ks | 1 +
fedora-workstation-packages.ks | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index a7d50a9..8c4899d 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -24,6 +24,7 @@ services --enabled=NetworkManager --disabled=network,sshd
@guest-desktop-agents
@standard
@core
+@fedora-release-nonproduct
@fonts
@input-methods
@dial-up
diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index fafac1d..ec46a1d 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -2,6 +2,7 @@
# Exclude unwanted groups that fedora-live-base.ks pulls in
-@dial-up
+-@fedora-release-nonproduct
-@input-methods
-@standard
9 years, 5 months
[spin-kickstarts] workstation: Pull in all of workstation-product-environment
by Kalev Lember
commit 0b975fe5d3f9f421fc048197f253b8521376c7ba
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Oct 18 15:21:38 2014 +0200
workstation: Pull in all of workstation-product-environment
... instead of listing individual groups manually in the kickstart file.
fedora-workstation-packages.ks | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index 236a44f..fafac1d 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -5,18 +5,8 @@
-@input-methods
-@standard
-# Make sure to sync any additions / removals done here with
-# workstation-product-environment in comps
-@base-x
-@core
-@fonts
-@guest-desktop-agents
-@hardware-support
-@libreoffice
-@multimedia
-@networkmanager-submodules
-@printing
-@workstation-product
+# Actual package selection is done in workstation-product-environment in comps
+@^workstation-product-environment
# Exclude unwanted packages from @anaconda-tools group
-gfs2-utils
9 years, 5 months
[spin-kickstarts/f21] workstation: Pull in all of workstation-product-environment
by Kalev Lember
commit 6c3c08f4425662b36a4ea4b3b89d3223a9a43ef5
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Oct 18 15:21:38 2014 +0200
workstation: Pull in all of workstation-product-environment
... instead of listing individual groups manually in the kickstart file.
fedora-workstation-packages.ks | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index 236a44f..fafac1d 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -5,18 +5,8 @@
-@input-methods
-@standard
-# Make sure to sync any additions / removals done here with
-# workstation-product-environment in comps
-@base-x
-@core
-@fonts
-@guest-desktop-agents
-@hardware-support
-@libreoffice
-@multimedia
-@networkmanager-submodules
-@printing
-@workstation-product
+# Actual package selection is done in workstation-product-environment in comps
+@^workstation-product-environment
# Exclude unwanted packages from @anaconda-tools group
-gfs2-utils
9 years, 5 months
[spin-kickstarts] SOAS: update from gconf to gsettings
by Peter Robinson
commit bfe90ab5061ac8ec1fb37b846dbb6a9d2979b1ec
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Fri Oct 17 17:32:26 2014 +0100
SOAS: update from gconf to gsettings
fedora-livecd-soas.ks | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 44f5d31..64f3ba6 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -76,13 +76,19 @@ sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.con
sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
# Don't use the default system user (in SoaS liveuser) as nick name
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
-
# Disable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
-
# Enable Sugar power management
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
+cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
+[org.sugarlabs.user]
+default-nick='disabled'
+
+[org.sugarlabs]
+show-logout=false
+
+[org.sugarlabs.power]
+automatic=true
+EOF
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
cat >> /etc/rc.d/init.d/livesys << EOF
# set up lightdm autologin
9 years, 5 months
[spin-kickstarts/f21] SOAS: update from gconf to gsettings
by Peter Robinson
commit 7f12fba617f84762cd8bed6cb34573dcffb0a3fc
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Fri Oct 17 17:32:26 2014 +0100
SOAS: update from gconf to gsettings
fedora-livecd-soas.ks | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 44f5d31..64f3ba6 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -76,13 +76,19 @@ sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.con
sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
# Don't use the default system user (in SoaS liveuser) as nick name
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
-
# Disable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
-
# Enable Sugar power management
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
+cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
+[org.sugarlabs.user]
+default-nick='disabled'
+
+[org.sugarlabs]
+show-logout=false
+
+[org.sugarlabs.power]
+automatic=true
+EOF
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
cat >> /etc/rc.d/init.d/livesys << EOF
# set up lightdm autologin
9 years, 5 months
[spin-kickstarts] ARM minimal: ensure we get fedora-release
by Peter Robinson
commit 25b862c1e1d46a64e563cc0fc264e2a1dccb2090
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Fri Oct 17 17:23:50 2014 +0100
ARM minimal: ensure we get fedora-release
fedora-arm-minimal.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks
index fd88555..3b6a480 100644
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -7,6 +7,7 @@ part / --size=1400 --fstype ext4
-@standard
-@dial-up
-initial-setup-gui
+-generic-release*
%end
%post
9 years, 5 months
[spin-kickstarts/f21] ARM minimal: ensure we get fedora-release
by Peter Robinson
commit ac6ae65e821d113e9c81921f7f76c464367eff8f
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Fri Oct 17 17:23:50 2014 +0100
ARM minimal: ensure we get fedora-release
fedora-arm-minimal.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks
index fd88555..3b6a480 100644
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -7,6 +7,7 @@ part / --size=1400 --fstype ext4
-@standard
-@dial-up
-initial-setup-gui
+-generic-release*
%end
%post
9 years, 5 months
Fixing the f21 branch of spin-kickstarts
by Bruno Wolff III
I reverted to back before Luya's errant merge.
Matthew removed the cloud big data spin after the errant merge, but I
think that was only necessary because of the errant merge. It is gone
now.
Matthew's other commit (dd extlinux mbr during post as temporary workaround
for bug #1147998) is not applying cleanly and needs to be looked at.
Luya needs to correctly do whatever he was trying to do originally.
In theory we are in a freeze now, so these changes should only be done now
if they are needed for freeze exception or blocker for beta. Otherwise
wait until after beta is gold.
9 years, 5 months
[spin-kickstarts/f21] updated dd extlinux mbr during post as temporary workaround for bug #1147998
by Matthew Miller
commit 5f29e730a34046539dbcfa5fac1a633fb533e3d2
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Wed Oct 15 09:24:48 2014 -0400
updated dd extlinux mbr during post as temporary workaround for bug #1147998
fedora-cloud-atomic.ks | 8 ++++++++
fedora-cloud-base.ks | 8 ++++++++
fedora-cloud-experimental.ks | 8 ++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index c8caf28..6e10fc0 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -167,6 +167,14 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 1cbfdc4..a61e82e 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -194,6 +194,14 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index b865c4c..fb902a5 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -192,6 +192,14 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
9 years, 5 months