tags 864025 + pending patch thanks I've uploaded ganeti-instance-debootstrap 0.16-2.1 to DELAYED/5: ganeti-instance-debootstrap (0.16-2.1) unstable; urgency=medium * Non-maintainer upload. * Fix "illegal option for fgrep" error by using "--" to escape the search needle. (Closes: #864025)
The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
diffstat for ganeti-instance-debootstrap-0.16 ganeti-instance-debootstrap-0.16 changelog | 8 ++++++++ patches/fix-sfdisk-BLKRRPART.patch | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff -Nru ganeti-instance-debootstrap-0.16/debian/changelog ganeti-instance-debootstrap-0.16/debian/changelog --- ganeti-instance-debootstrap-0.16/debian/changelog 2017-05-03 14:44:54.000000000 +0100 +++ ganeti-instance-debootstrap-0.16/debian/changelog 2017-06-06 17:00:39.000000000 +0100 @@ -1,3 +1,11 @@ +ganeti-instance-debootstrap (0.16-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "illegal option for fgrep" error by using "--" to escape the search + needle. (Closes: #864025) + + -- Chris Lamb <la...@debian.org> Tue, 06 Jun 2017 17:00:39 +0100 + ganeti-instance-debootstrap (0.16-2) unstable; urgency=medium * Skip newer sfdisk's check using the BLKRRPART ioctl (Closes: #853167). diff -Nru ganeti-instance-debootstrap-0.16/debian/patches/fix-sfdisk-BLKRRPART.patch ganeti-instance-debootstrap-0.16/debian/patches/fix-sfdisk-BLKRRPART.patch --- ganeti-instance-debootstrap-0.16/debian/patches/fix-sfdisk-BLKRRPART.patch 2017-05-03 14:44:54.000000000 +0100 +++ ganeti-instance-debootstrap-0.16/debian/patches/fix-sfdisk-BLKRRPART.patch 2017-06-06 17:00:39.000000000 +0100 @@ -11,15 +11,15 @@ Forwarded: no Last-Update: 2017-05-03 Bug-Debian: https://bugs.debian.org/853167 ---- a/common.sh.in -+++ b/common.sh.in -@@ -94,6 +94,11 @@ +--- ganeti-instance-debootstrap-0.16.orig/common.sh.in ++++ ganeti-instance-debootstrap-0.16/common.sh.in +@@ -94,6 +94,11 @@ format_disk0() { if sfdisk --help | grep -q -e '--cylinders'; then ARGS="-H 64 -S 32 -u S --Linux" 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