[Pkg-ganeti-devel] Bug#864025: ganeti-instance-debootstrap: illegal option for fgrep

[Chris Lamb]

tags 864025 + patch
thanks

Hi,

This was a regression from ganeti-instance-debootstrap (0.16-2):

  3   * Skip newer sfdisk's check using the BLKRRPART ioctl (Closes: #853167).
  4     This check will always fail with non-partitionable devices, such as DRBD
  5     and LVM, completely breaking disk partitioning. Thanks to Martin Weinelt
  6     <hexa at darmstadt.ccc.de> for testing and feedback!


Patch attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby at debian.org / chris-lamb.co.uk
       `-
-------------- next part --------------
diff --git a/debian/patches/fix-sfdisk-BLKRRPART.patch b/debian/patches/fix-sfdisk-BLKRRPART.patch
index 040fd1f..fd54ba8 100644
--- a/debian/patches/fix-sfdisk-BLKRRPART.patch
+++ b/debian/patches/fix-sfdisk-BLKRRPART.patch
@@ -19,7 +19,7 @@ Bug-Debian: https://bugs.debian.org/853167
    fi
 +  # Some versions of sfdisk need to be told to skip checking using ioctl(dev,
 +  # BLKRRPART), as this always fails for DRBD and LVM devices.
-+  if sfdisk --help | fgrep -q '--no-reread'; then
++  if sfdisk --help | fgrep -q -- '--no-reread'; then
 +    ARGS="--no-reread $ARGS"
 +  fi
    sfdisk $ARGS --quiet "$1" <<EOF