From bc2199144e08e3c8aae872691f517c89b8e1c367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Mon, 26 Oct 2015 11:19:28 +0900 Subject: [PATCH] Selectively prune /root for ironic-agent ramdisk Previously all files in /root were ignored when building the ironic-agent ramdisk. This prevented for example to use the local-config element to connect to the ramdisk via ssh as root user. This commit change the exclude rule on /root to only ignore the /root/.cache directory. Change-Id: I18d839e8d97636f5f2164ba407f252407d9bc956 Closes-Bug: #1451668 --- elements/ironic-agent/cleanup.d/99-ramdisk-create | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/elements/ironic-agent/cleanup.d/99-ramdisk-create b/elements/ironic-agent/cleanup.d/99-ramdisk-create index 3af74d1e1..e4a9361eb 100755 --- a/elements/ironic-agent/cleanup.d/99-ramdisk-create +++ b/elements/ironic-agent/cleanup.d/99-ramdisk-create @@ -21,7 +21,18 @@ sudo ln -s ./sbin/init ./ # Remove python object files, they're not particularly useful for a ramdisk sudo find ./usr -name "*.pyc" -or -name "*.pyo" -delete -sudo find . -xdev -path './sys/*' -prune -o -path './tmp/*' -prune -o -path './boot/*' -prune -o -path './root/*' -prune -o -path './usr/lib/locale/*' -prune -o -path './usr/share/doc/*' -prune -o -path './usr/share/man/*' -prune -o -path './usr/share/info/*' -prune -o -path './usr/share/licenses/*' -prune -o -path './usr/share/misc/*' -prune -o -print | sudo cpio -o -H newc | gzip > ${IMAGE_PATH}.initramfs +sudo find . -xdev \ + -path './sys/*' -prune -o \ + -path './tmp/*' -prune -o \ + -path './boot/*' -prune -o \ + -path './root/.cache' -prune -o \ + -path './usr/lib/locale/*' -prune -o \ + -path './usr/share/doc/*' -prune -o \ + -path './usr/share/man/*' -prune -o \ + -path './usr/share/info/*' -prune -o \ + -path './usr/share/licenses/*' -prune -o \ + -path './usr/share/misc/*' -prune -o \ + -print | sudo cpio -o -H newc | gzip > ${IMAGE_PATH}.initramfs select_boot_kernel_initrd $TARGET_ROOT sudo cp $BOOTDIR/$KERNEL ${IMAGE_PATH}.kernel