sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Optimize speed of deletion in find command"

Browse source
This commit is contained in:
Jenkins 2014-10-30 12:53:28 +00:00 committed by Gerrit Code Review
commit d72435a86b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
elements/dpkg/root.d/60-block-apt-translations
View file

@ -11,4 +11,4 @@ APT::Acquire::Languages "none";
EOF
# And now make sure that we don't fall foul of Debian bug 641967
find $TARGET_ROOT/var/lib/apt/lists/ -type f -name '*_i18n_Translation-*' -exec sudo rm -f {} \;
find $TARGET_ROOT/var/lib/apt/lists/ -type f -name '*_i18n_Translation-*' -exec sudo rm -f {} +

2
elements/redhat-common/pre-install.d/15-remove-grub
View file

@ -9,7 +9,7 @@ yum remove -y grub2
# Remove all old versions of grub2 from the yum cache and then ensure the
# latest version is in the cache.
basearch=$(cat /etc/yum/vars/basearch)
find /tmp/yum/$basearch -regex ".*/grub2-[0-9].*\.rpm" -exec rm -f {} \;
find /tmp/yum/$basearch -regex ".*/grub2-[0-9].*\.rpm" -exec rm -f {} +
install-packages -d grub2
# Copy grub2 rpm out of mounted yum cache for install during finalise

2
lib/ramdisk-functions
View file

@ -171,7 +171,7 @@ function populate_lib () {
cp -a "$MODULE_DIR" "$TMP_MOUNT_PATH/lib/modules/$KERNEL_VERSION"
echo "Removing kernel framebuffer drivers to enforce text mode consoles..."
find $TMP_MOUNT_PATH/lib/modules/$KERNEL_VERSION/kernel/drivers/video -name '*fb.ko' -exec rm -v {} \;
find $TMP_MOUNT_PATH/lib/modules/$KERNEL_VERSION/kernel/drivers/video -name '*fb.ko' -exec rm -v {} +
if [ -d $FIRMWARE_DIR ]; then
cp -a "$FIRMWARE_DIR" "$TMP_MOUNT_PATH/lib/firmware"
fi