[spin-kickstarts/f21] design-suite: remove legacy comments
by Luya Tshimbalanga
commit 81d2f86266d0e1b23ef5e69d429c4abfb516f65a
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue Nov 11 20:30:44 2014 -0800
design-suite: remove legacy comments
fedora-live-design_suite.ks | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index c39da21..92bf183 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -73,27 +73,6 @@ overpass-fonts
-gnome-photos
-rdesktop
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--minicom
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--telnet
--nfs-utils
--ypbind
--yp-tools
--rpcbind
--acpid
--ntsysv
-
%end
%post
9 years, 5 months
[spin-kickstarts] design-suite: remove legacy comments
by Luya Tshimbalanga
commit afbd3531406ee35f2667dfb64cdac42a2bba2064
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue Nov 11 20:30:44 2014 -0800
design-suite: remove legacy comments
fedora-live-design_suite.ks | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index e001fdc..e9a6c24 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -77,27 +77,6 @@ overpass-fonts
-gnome-photos
-rdesktop
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--minicom
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--telnet
--nfs-utils
--ypbind
--yp-tools
--rpcbind
--acpid
--ntsysv
-
%end
%post
9 years, 5 months
[spin-kickstarts/f21] Revert "builds failed last night with "an additional 861.02 MiB is needed""
by Matthew Miller
commit f8b2d154d62ce638b2d0885a74415f5fa08f076f
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Nov 11 18:54:05 2014 -0500
Revert "builds failed last night with "an additional 861.02 MiB is needed""
This wasn't the problem. :)
This reverts commit 4f2df51206f9d8112b3be7a9528b528d9bd5800a.
fedora-cloud-atomic.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index f08cc84..5465ed9 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -27,7 +27,7 @@ clearpart --all
part /boot --size=200 --fstype="ext4"
part pv.01 --grow
volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
+logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos
ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
9 years, 5 months
[spin-kickstarts/f21] builds failed last night with "an additional 861.02 MiB is needed"
by Matthew Miller
commit 4f2df51206f9d8112b3be7a9528b528d9bd5800a
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Nov 11 11:06:49 2014 -0500
builds failed last night with "an additional 861.02 MiB is needed"
fedora-cloud-atomic.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 5465ed9..f08cc84 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -27,7 +27,7 @@ clearpart --all
part /boot --size=200 --fstype="ext4"
part pv.01 --grow
volgroup atomicos pv.01
-logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos
+logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
9 years, 5 months
[spin-kickstarts/f21] add missing CJK fonts and localization
by Wolfgang Ulbrich
commit fb107cf7404c501df92c49860f891916f0a657f9
Author: raveit65 <chat-to-me(a)raveit.de>
Date: Tue Nov 11 17:04:21 2014 +0100
add missing CJK fonts and localization
fedora-livecd-mate_compiz.ks | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/fedora-livecd-mate_compiz.ks b/fedora-livecd-mate_compiz.ks
index 415accf..fc58b8d 100644
--- a/fedora-livecd-mate_compiz.ks
+++ b/fedora-livecd-mate_compiz.ks
@@ -32,6 +32,7 @@ audacious
-firefox
-GConf2
-gnome-bluetooth-libs
+-gnome-icon-theme
-gnome-icon-theme-symbolic
-gnome-software
-gnome-themes
@@ -52,17 +53,9 @@ audacious
-transmission-gtk
-samba-client
-ibus-chewing
--ibus-typing-booster
--ibus-kkc
-ImageMagick
-ImageMagick-libs
-libical
--libkkc
--libkkc-data #save 30MB
--skkdic # save 25MB
--ibus-libpinyin
--libpinyin
--libpinyin-data #save 31MB
-OpenEXR-libs
-reiserfs-utils
-seahorse
@@ -75,12 +68,7 @@ audacious
-gnu-free-fonts-common
-gnu-free-serif-fonts
-gnu-free-sans-fonts
--naver-nanum-gothic-fonts # save 14MB
-stix-fonts
--vlgothic-fonts
--paratype-pt-sans-fonts
--jomolhari-fonts
--sil-abyssinica-fonts
# Drop the Java plugin
-icedtea-web
9 years, 5 months
[spin-kickstarts/f21] cloud-atomic: Forcibly power off after %post to work around bug
by Colin Walters
commit 377cf487ed432ba763d9e82d4c1afe531604d863
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Nov 10 14:11:28 2014 -0500
cloud-atomic: Forcibly power off after %post to work around bug
The system loops with:
mkdir: cannot create directory '/oldsys': Read-only filesystem
mkdir: cannot create directory '/oldsys/sys': Read-only filesystem
mount: mount point /oldsys/sys does not exist
...
drauct Warning: Killing all remaining processes
...
--- begin loop ---
Unable to unlink device node for atomicos-root
Unable to unlink device node for live-base
rm: cannot remove /lib/drauct/hooks/shutdown/30-dm-shutdown.sh: Read-only filesystem
rm: cannot remove /lib/drauct/hooks/shutdown/30-md-shutdown.sh: Read-only filesystem
--- end loop ---
Not entirely sure what's at fault here, but this is a quick hack to
get an image building.
fedora-cloud-atomic.ks | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 63106d1..5465ed9 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -136,3 +136,10 @@ echo "(Don't worry -- that out-of-space error was expected.)"
%end
+%post --nochroot
+# Work around anaconda/dracut/lvm bug
+sync
+sync
+sync
+systemctl reboot -f -f
+%end
9 years, 5 months
[spin-kickstarts/f21] cloud-atomic: Re-shrink rootfs partitions
by Colin Walters
commit 09243c9986043d877c7282436d462bdeeaac0dbb
Author: Colin Walters <walters(a)verbum.org>
Date: Sat Nov 8 13:27:05 2014 -0500
cloud-atomic: Re-shrink rootfs partitions
mattdm changed these previously because we hit an ENOSPC error during
qcow2 image creation, but that *really* happened because the Fedora
rel-eng create-cloud-images script hardcoded 3GB.
Now that we've shrunk the content down to ~850MB, drop the defaults:
- rootfs down to 2GB. This is enough space for a replacement of
all content, plus a bit of spare room for logging
- /boot to 200MB. At present, kernel+initramfs is just 30MB,
so this is still very conservative.
fedora-cloud-atomic.ks | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 37fb815..63106d1 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -24,10 +24,10 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
zerombr
clearpart --all
# Atomic differs from cloud - we want LVM
-part /boot --size=500 --fstype="ext4"
+part /boot --size=200 --fstype="ext4"
part pv.01 --grow
volgroup atomicos pv.01
-logvol / --size=5000 --fstype="xfs" --name=root --vgname=atomicos
+logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos
ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
9 years, 5 months
[spin-kickstarts/f21] cloud-atomic: Drop SELinux relabeling
by Colin Walters
commit e46c5128671cdd210891793204f95c8e366b33e5
Author: Colin Walters <walters(a)verbum.org>
Date: Sat Nov 8 13:11:12 2014 -0500
cloud-atomic: Drop SELinux relabeling
This should not be necessary; we have policy loaded from the Anaconda
environment.
fedora-cloud-atomic.ks | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index dbfd4bd..37fb815 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -128,15 +128,6 @@ rm -f /var/lib/rpm/__db*
# <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
-mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
-/usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
-
echo "Zeroing out empty space."
# This forces the filesystem to reclaim space from deleted files
dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
9 years, 5 months
[spin-kickstarts/f21] atomic: Rewrite origin to point to metalink
by Colin Walters
commit 0ba1d1dbc68f3387c62cf805c21ace3fd27ad58f
Author: Colin Walters <walters(a)verbum.org>
Date: Fri Nov 7 13:49:57 2014 -0500
atomic: Rewrite origin to point to metalink
Basically Anaconda-in-ImageFactory is set up to pull from the
builder, so that's what ends up in the origin file. But that's
obviously not what we want to ship to users.
ostree/rpm-ostree do not yet have a convenient command to change this,
so brute force it with sed.
Implements https://lists.fedoraproject.org/pipermail/cloud/2014-November/004570.html
fedora-cloud-atomic.ks | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 0e16542..dbfd4bd 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -36,6 +36,9 @@ reboot
%post --erroronfail
+# See https://github.com/projectatomic/rpm-ostree/issues/42
+ostree remote add --set=gpg-verify=false fedora-atomic 'metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-atomic-21...'
+(origin_file=$(echo -n /ostree/deploy/fedora-atomic-host/deploy/*.origin); sed -e 's,installmedia:,fedora-atomic:,' < ${origin_file} > ${origin_file}.new && mv ${origin_file}{.new,})
# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
9 years, 5 months