diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-26 16:44:37 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:39:19 +0000 |
| commit | 16ab0c7fe036f77eaad3ed611cba6a1ce50baef2 (patch) | |
| tree | 17c59907d7a5af3ee1ee5d20b9c6aa6b3844ae16 /patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch | |
| parent | c695afba33c538032af751dd02748f83ff4c877c (diff) | |
Rebase: Drop cpio symlink patch (upstream).
Drop p/fuel-main/0003-Make-cpio-accept-symlinks.patch,
since this is now covered by OPNFV commit f544e41,
"Correction due to changed cpio behavior".
For details, see https://jira.opnfv.org/browse/FUEL-125
Change-Id: I6c04e34cb7a5af5681745f1cdd026809c65720ce
(cherry picked from commit 890027f3b712797e699a3883d1f454a1d7c7c3bb)
Diffstat (limited to 'patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch')
| -rw-r--r-- | patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch new file mode 100644 index 00000000..e3d13b85 --- /dev/null +++ b/patches/fuel-main/0003-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 |