From f3be74471dd055281e2bcb80a25cbd5f2f449877 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 14 Sep 2014 17:10:16 +0200
Subject: [PATCH] Be more conservative and upfront when attaching data to the
 bug report

Rework bug-script to be more upfront about what kind of data is gathered
and ask the user for permission before attaching the information to the
bug report.

Closes: #756248
---
 debian/changelog          |  3 +++
 debian/systemd.bug-script | 22 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75207ea09..e54443b8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ systemd (215-3) UNRELEASED; urgency=medium
     on logind. (Closes: #758111)
   * Bump dependency on systemd-shim to (>= 7-2) to ensure we have a version
     which supports systemd >= 209.
+  * Rework bug-script to be more upfront about what kind of data is attached
+    and ask the user for permission before attaching the information to the
+    bug report. (Closes: #756248)
 
  -- Martin Pitt <mpitt@debian.org>  Mon, 08 Sep 2014 12:58:27 +0200
 
diff --git a/debian/systemd.bug-script b/debian/systemd.bug-script
index 7af62d8e3..3b66b02ad 100644
--- a/debian/systemd.bug-script
+++ b/debian/systemd.bug-script
@@ -1,7 +1,22 @@
 #!/bin/bash
 
-REPORTBUG_VERSION=$(dpkg-query -f '${source:Version}' -W reportbug)
+cat <<EOF
 
+Providing additional information can help diagnose problems with systemd.
+Specifically, this would include:
+- fstab configuration (copy of /etc/fstab).
+- local modifications of unit files (output of systemd-delta).
+- state of running services and units (output of systemd-analzye dump).
+- enabled/disabled state of installed services.
+If this information is not relevant for your bug report or you have privacy
+concerns, please choose no.
+
+EOF
+
+yesno "Do you want to provide additional information [Y|n]? " yep
+[ "$REPLY" = yep ] || exit 0
+
+REPORTBUG_VERSION=$(dpkg-query -f '${source:Version}' -W reportbug)
 
 # Depending on whether reportbug is new enough, we either write the output of
 # our various commands to a file and attach them to the report (this needs
@@ -30,10 +45,7 @@ if dpkg --compare-versions "$REPORTBUG_VERSION" ge "6.5.0"; then
         echo "$DIR/dsh-enabled.txt" >&3
     fi
 
-    yesno "Do you want to provide fstab information [Y|n]? " yep
-    if [ "$REPLY" = yep ]; then
-        echo "/etc/fstab" >&3
-    fi
+    echo "/etc/fstab" >&3
 
     echo "-- END ATTACHMENTS --" >&3
 else