[libvirt] [PATCH] block/sheepdog: rename management program from collie to dog

[Eric Blake]

On 06/23/2014 12:20 AM, Hitoshi Mitake wrote:
> The management program of latest sheepdog is named as "dog", "collie"
> is obsolete. This patch updates the name in the configure script and
> the sheepdog driver.
> 
> Signed-off-by: Vasiliy Tolstov <v.tolstov at selfip.ru>
> Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
> ---
>  configure.ac                           |   10 +++++-----
>  src/storage/storage_backend_sheepdog.c |   12 ++++++------
>  2 files changed, 11 insertions(+), 11 deletions(-)

Please re-read the comments given at the first attempt at this patch:
https://www.redhat.com/archives/libvir-list/2014-June/msg00760.html

> 
> diff --git a/configure.ac b/configure.ac
> index 710cb71..186d9e3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1926,14 +1926,14 @@ AC_SUBST([LIBRBD_LIBS])
>  
>  if test "$with_storage_sheepdog" = "yes" ||
>     test "$with_storage_sheepdog" = "check"; then
> -  AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin])
> +  AC_PATH_PROG([DOG], [dog], [], [$PATH:/sbin:/usr/sbin])

This is wrong; you need to test for both names, and use the correct one,
in order to be back-compat safe.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140623/7913d690/attachment-0001.sig>