[spin-kickstarts/f21] hack around instLangs not working (due to https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
by Matthew Miller
commit 66f3423525db7b0eac5a86b3db61ee8247d66e9e
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Sat Nov 8 13:29:50 2014 -0500
hack around instLangs not working (due to https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
fedora-cloud-base.ks | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 774cd25..82bbec6 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -37,6 +37,8 @@ part / --size 3000 --fstype ext4
reboot
# Package list.
+# FIXME: instLangs does not work, so there's a hack below
+# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
%packages --instLangs=en
kernel-core
@@ -117,6 +119,13 @@ yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
echo "Removing authconfig."
yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+# instlang hack. (Note! See bug referenced above package list)
+find /usr/share/locale -mindepth 1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
+localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
+# this will kill a live system (since it's memory mapped) but should be safe offline
+mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+build-locale-archive
+
echo -n "Getty fixes"
# although we want console output going to the serial console, we don't
# actually have the opportunity to login there. FIX.
9 years, 5 months
[spin-kickstarts/f21] remove heat-cfntools from cloud image until python3 / boto issue can be resolved
by Matthew Miller
commit 365e62a37e692d149020d7e96937014fb9badc50
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Sun Nov 9 11:06:15 2014 -0500
remove heat-cfntools from cloud image until python3 / boto issue can be resolved
fedora-cloud-base.ks | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 6a1417a..774cd25 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -55,6 +55,9 @@ kernel-core
-kernel
-grub2
+# remove until python3 / boto issue can be resolved
+-heat-cfntools
+
%end
9 years, 5 months
[spin-kickstarts] hack around instLangs not working (due to https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
by Matthew Miller
commit 0d68707f4b850eb4748e9a529621d49a99e0f067
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Sat Nov 8 13:29:50 2014 -0500
hack around instLangs not working (due to https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
fedora-cloud-base.ks | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 44b5680..195b723 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -37,6 +37,8 @@ part / --size 3000 --fstype ext4
reboot
# Package list.
+# FIXME: instLangs does not work, so there's a hack below
+# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
%packages --instLangs=en
kernel-core
@@ -119,6 +121,13 @@ dnf -C -y erase "firewalld*"
echo "Removing authconfig."
dnf -C -y erase authconfig
+# instlang hack. (Note! See bug referenced above package list)
+find /usr/share/locale -mindepth 1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
+localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
+# this will kill a live system (since it's memory mapped) but should be safe offline
+mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+build-locale-archive
+
echo -n "Getty fixes"
# although we want console output going to the serial console, we don't
# actually have the opportunity to login there. FIX.
9 years, 5 months
[spin-kickstarts] cloud images -- leave persistant journal, since upcoming cloud-init no longer pulls in rsyslog
by Matthew Miller
commit f59d761db75c16e48ba59201960b32cf54ac7d22
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Fri Nov 7 21:55:36 2014 -0500
cloud images -- leave persistant journal, since upcoming cloud-init no longer pulls in rsyslog
fedora-cloud-atomic.ks | 5 -----
fedora-cloud-base.ks | 5 -----
fedora-cloud-bigdata.ks | 5 -----
fedora-cloud-experimental.ks | 5 -----
4 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index dcd5c6f..77162f6 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -42,11 +42,6 @@ passwd -l root
# remove the user anaconda forces us to make
userdel -r none
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/
-echo .
-
echo -n "Getty fixes"
# although we want console output going to the serial console, we don't
# actually have the opportunity to login there. FIX.
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index e88e24b..44b5680 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -100,11 +100,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/
-echo .
-
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
dnf -C -y erase linux-firmware
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 1a9ef6a..56ded29 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -107,11 +107,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/
-echo .
-
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index fb902a5..55df15e 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -98,11 +98,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/
-echo .
-
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware
9 years, 5 months
[spin-kickstarts/f21] cloud images -- leave persistant journal, since upcoming cloud-init no longer pulls in rsyslog
by Matthew Miller
commit 4971745782341af27d018b9b42d71c55b9a37a94
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Fri Nov 7 21:55:36 2014 -0500
cloud images -- leave persistant journal, since upcoming cloud-init no longer pulls in rsyslog
fedora-cloud-atomic.ks | 5 -----
fedora-cloud-base.ks | 5 -----
fedora-cloud-experimental.ks | 5 -----
3 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index be862c4..0e16542 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -53,11 +53,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/
-echo .
-
echo -n "Getty fixes"
# although we want console output going to the serial console, we don't
# actually have the opportunity to login there. FIX.
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index a61e82e..6a1417a 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -100,11 +100,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/
-echo .
-
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index fb902a5..55df15e 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -98,11 +98,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/
-echo .
-
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware
9 years, 5 months
[spin-kickstarts] point the atomic tree at the rawhide compose url
by Dennis Gilmore
commit be35caf183c0ae38b765ebdacbd1a9b3a8e657a9
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Nov 7 18:51:10 2014 -0600
point the atomic tree at the rawhide compose url
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 91e123e..dcd5c6f 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -30,7 +30,7 @@ volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://dl.fedoraproject.org/pub/alt/fedora-atomic/repo --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
reboot
9 years, 5 months
[spin-kickstarts/f21] nightly builds failing due to size.
by Matthew Miller
commit 2a0fdd52419f03f4e25a42d1d469df6888fde1f8
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu Nov 6 23:08:20 2014 -0500
nightly builds failing due to size.
enlarge so it works, and then we'll figure it out
see http://koji.fedoraproject.org/koji/taskinfo?taskID=8054050 (check the screenshot)
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 7b683c2..be862c4 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=300 --fstype="ext4"
+part /boot --size=500 --fstype="ext4"
part pv.01 --grow
volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
+logvol / --size=5000 --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] atomic: We do not support pv-grub
by Matthew Miller
commit fbeec77bd53e4c6da48acfef1d7cb4815adbafdd
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Nov 6 20:36:09 2014 -0500
atomic: We do not support pv-grub
Atomic is HVM only, since OSTree doesn't understand grub1 at the
moment, and incentive to have it do so is low.
fedora-cloud-atomic.ks | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 5b3a62b..7b683c2 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -37,29 +37,6 @@ reboot
%post --erroronfail
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do
- echo "title Fedora ($kv)" >> /boot/grub/grub.conf
- echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
- echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
- echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
- echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
-
# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
9 years, 5 months
[spin-kickstarts/f21] atomic: Drop package deinstallation
by Matthew Miller
commit b69402e4b4b7465e32d087e87f7e96f2e9a3ffde
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Nov 6 20:34:38 2014 -0500
atomic: Drop package deinstallation
This isn't supported; at the moment the tree has authconfig and
linux-firmware, but not firewalld.
fedora-cloud-atomic.ks | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 1c4d959..5b3a62b 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -81,20 +81,6 @@ echo -n "Disabling persistent journal"
rmdir /var/log/journal/
echo .
-# this is installed by default but we don't need it in virt
-echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
-
-# Remove firewalld; was supposed to be optional in F18+, but is required to
-# be present for install/image building.
-echo "Removing firewalld."
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-
-# Another one needed at install time but not after that, and it pulls
-# in some unneeded deps (like, newt and slang)
-echo "Removing authconfig."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
-
echo -n "Getty fixes"
# although we want console output going to the serial console, we don't
# actually have the opportunity to login there. FIX.
9 years, 5 months
[spin-kickstarts/f21] atomic: Switch /boot to ext4
by Colin Walters
commit 13cc8ee768f6cf9b80990f606fcc901a7b7dc280
Author: Colin Walters <walters(a)verbum.org>
Date: Wed Nov 5 12:38:27 2014 -0500
atomic: Switch /boot to ext4
For some reason Anaconda in Fedora rejects XFS as /boot, even though
that's what RHEL defaults to.
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 ea28fcf..1c4d959 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -24,7 +24,7 @@ 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=300 --fstype="xfs"
+part /boot --size=300 --fstype="ext4"
part pv.01 --grow
volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
9 years, 5 months
