summaryrefslogtreecommitdiffstats
path: root/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
diff options
context:
space:
mode:
authorStanislaw Kardach <kda@semihalf.com>2016-03-29 15:06:02 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-03-29 14:16:43 +0000
commit0f762e556ea7b2393f56ca7fb8e06f66f99880aa (patch)
treeb29dfebef5de0a545f190d28f061cedf813195fe /patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
parentccf57699bbff183ef45fd4a4e94df094ca69ee87 (diff)
Clean up and fix Libvirt and Ceph
[ Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ] * Fix upload_cirros timeout * Workaround for default video device in nova * Fix syntax and increase TestVM's RAM requirements [ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ] * Cleanup: Obsolete SEPARATE_IMAGES. * Nova libvirt drv: arm64: Update console default. * fuel{,-main}: Cleanup obsolete patches. * nova: Fix inject for direct boot with part table. See https://bugs.launchpad.net/nova/+bug/1290455 for full bug description. For now, we detect direct kernel boot with a partition table inside disk image by passing target_partition when root kernel arg points to a partition (instead of the whole disk). * Drop obsolete/done TODO entries. * Nova: Fix os cmd line parsing for list case. * ceph: Fix obsolete XFS mount param. * Fix out-of-order embedded patch hunks. Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch')
-rw-r--r--patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
new file mode 100644
index 00000000..e3d13b85
--- /dev/null
+++ b/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
@@ -0,0 +1,39 @@
+From: Florin Dumitrascu <florin.dumitrascu@enea.com>
+Date: Fri, 4 Mar 2016 17:19:41 +0100
+Subject: [PATCH] Add cobbler-grub-aarch64 RPM reinstall to start.sh
+
+Because /var/lib/cobbler is mounted as a volume, new cobbler aarch64
+grub loader packaged as an RPM (cobbler-grub-aarch64) should be
+reinstalled if its files are missing on Docker container start.
+---
+ docker/cobbler/setup.sh | 2 +-
+ docker/cobbler/start.sh | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/docker/cobbler/setup.sh b/docker/cobbler/setup.sh
+index a7fce0c..90627a8 100644
+--- a/docker/cobbler/setup.sh
++++ b/docker/cobbler/setup.sh
+@@ -31,7 +31,7 @@ yum update -y
+
+ ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf
+
+-packages="httpd cobbler dnsmasq xinetd tftp-server"
++packages="httpd cobbler cobbler-grub-aarch64 dnsmasq xinetd tftp-server"
+ echo $packages | xargs -n1 yum install -y
+
+
+diff --git a/docker/cobbler/start.sh b/docker/cobbler/start.sh
+index 3c5d411..c1a359b 100644
+--- a/docker/cobbler/start.sh
++++ b/docker/cobbler/start.sh
+@@ -18,6 +18,9 @@ fi
+ if rpm -V cobbler-web | grep -q missing; then
+ yum reinstall -q -y cobbler-web
+ fi
++if rpm -V cobbler-grub-aarch64 | grep -q missing; then
++ yum reinstall -q -y cobbler-grub-aarch64
++fi
+
+
+ # Run puppet to apply custom config