I don't think either of these are the cause of the hang, but I believe they're both correct. Tested with a local ImageFactory run.
From 41f019b6d58f59863e282727e695ef196deac87e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Thu, 6 Nov 2014 20:34:38 -0500
Subject: [PATCH 1/2] 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 file changed, 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.
--
1.8.3.1
From dd923232d35f65ba43f24487127f7133e9d138b0 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Thu, 6 Nov 2014 20:36:09 -0500
Subject: [PATCH 2/2] 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 file changed, 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
--
1.8.3.1
_______________________________________________
cloud mailing list
cloud@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/cloud
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
