[Libguestfs] [PATCH] Quoting in supermin-split.sh
Richard W.M. Jones
rjones at redhat.com
Mon Mar 1 11:57:46 UTC 2010
See the comment near the top of the patch ...
This is a proposed fix for:
https://bugzilla.redhat.com/show_bug.cgi?id=566511
https://bugzilla.redhat.com/show_bug.cgi?id=566512
It needs testing on a wider range of bash versions, eg. bash <= 3.1
and bash < 4.0, and whatever bash was included in RHEL 5.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top
-------------- next part --------------
--- libguestfs-1.0.84.orig/appliance/supermin-split.sh.in 2010-01-28 09:58:20.000000000 +0000
+++ libguestfs-1.0.84.rhbz566512/appliance/supermin-split.sh.in 2010-03-01 11:43:20.647728435 +0000
@@ -51,17 +51,27 @@
dir=$(dirname "$path")
file=$(basename "$path")
+ # For quoting problems with the bash =~ operator, see bash FAQ
+ # question E14 here http://tiswww.case.edu/php/chet/bash/FAQ and
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487387#25
+ # (RHBZ#566511).
+
# All we're going to keep are the special files /init, the daemon,
# configuration files (/etc), devices and modifiable stuff (/var).
if [ "$path" = "./init" -o "$file" = "guestfsd" ]; then
echo "$path" >&5
- elif [[ "$path" =~ '^\./etc' || "$path" =~ '^./dev' || "$path" =~ '^\./var' ]]; then
+ elif [[ "$path" =~ ^\./etc || "$path" =~ ^./dev || "$path" =~ ^\./var ]]; then
echo "$path" >&5
# Kernel modules are always copied in from the host, including all
# the dependency files.
- elif [[ "$path" =~ '^\./lib/modules/' ]]; then
+ elif [[ "$path" =~ ^\./lib/modules/ ]]; then
+ :
+
+ # On mock/Koji, exclude bogus /builddir directory which for some
+ # reason contains some yum temporary files (RHBZ#566512).
+ elif [[ "$path" =~ ^\./builddir ]]; then
:
elif [ -d "$path" ]; then
@@ -71,27 +81,27 @@
# Some libraries need fixed version numbers replaced by wildcards.
- elif [[ "$file" =~ '^ld-[.0-9]+\.so$' ]]; then
+ elif [[ "$file" =~ ^ld-[.0-9]+\.so$ ]]; then
echo "$dir/ld-*.so" >&6
# Special case for libbfd
- elif [[ "$file" =~ '^libbfd-.*\.so$' ]]; then
+ elif [[ "$file" =~ ^libbfd-.*\.so$ ]]; then
echo "$dir/libbfd-*.so" >&6
# Special case for libgcc_s-<gccversion>-<date>.so.N
- elif [[ "$file" =~ '^libgcc_s-.*\.so\.([0-9]+)$' ]]; then
+ elif [[ "$file" =~ ^libgcc_s-.*\.so\.([0-9]+)$ ]]; then
echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6
# libfoo-1.2.3.so
- elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so$' ]]; then
+ elif [[ "$file" =~ ^lib(.*)-[-.0-9]+\.so$ ]]; then
echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6
# libfoo-1.2.3.so.1.2.3 (but NOT '*.so.N')
- elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.' ]]; then
+ elif [[ "$file" =~ ^lib(.*)-[-.0-9]+\.so\.([0-9]+)\. ]]; then
echo "$dir/lib${BASH_REMATCH[1]}-*.so.${BASH_REMATCH[2]}.*" >&6
# libfoo.so.1.2.3 (but NOT '*.so.N')
- elif [[ "$file" =~ '^lib(.*)\.so\.([0-9]+)\.' ]]; then
+ elif [[ "$file" =~ ^lib(.*)\.so\.([0-9]+)\. ]]; then
echo "$dir/lib${BASH_REMATCH[1]}.so.${BASH_REMATCH[2]}.*" >&6
else
More information about the Libguestfs
mailing list