aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-main/0003-Make-cpio-accept-symlinks.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/0003-Make-cpio-accept-symlinks.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/0003-Make-cpio-accept-symlinks.patch')
-rw-r--r--patches/fuel-main/0003-Make-cpio-accept-symlinks.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch b/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch
new file mode 100644
index 00000000..00c2ce41
--- /dev/null
+++ b/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch
@@ -0,0 +1,27 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Wed, 2 Mar 2016 10:04:32 +0100
+Subject: [PATCH] Make cpio accept symlinks
+
+---
+ bootstrap/module.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bootstrap/module.mk b/bootstrap/module.mk
+index cb09691..3f28172 100644
+--- a/bootstrap/module.mk
++++ b/bootstrap/module.mk
+@@ -230,11 +230,11 @@ $(BUILD_DIR)/bootstrap/prepare-initram-root.done: \
+
+ # Installing kernel modules
+ find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \
+- ( cd $(INITRAMROOT); sudo cpio -idm './lib/modules/*' './boot/vmlinuz*' )
++ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/modules/*' './boot/vmlinuz*' )
+ find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_FIRMWARE_PATTERN)' | xargs rpm2cpio | \
+- ( cd $(INITRAMROOT); sudo cpio -idm './lib/firmware/*' )
++ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/firmware/*' )
+ find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name 'libmlx4*' | xargs rpm2cpio | \
+- ( cd $(INITRAMROOT); sudo cpio -idm './etc/*' './usr/lib64/*' )
++ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './etc/*' './usr/lib64/*' )
+ for version in `ls -1 $(INITRAMROOT)/lib/modules`; do \
+ sudo depmod -b $(INITRAMROOT) $$version; \
+ done