Merge lp:~laney/whoopsie-preferences/hack-update-rc-d into lp:whoopsie-preferences

[Iain Lane]

If we can't use update-rc.d to clear the upstart .override file (to enable whoopsie), try to do it ourselves.

update-rc.d uses renames to update the file atomically. This doesn't work on our read only Ubuntu touch setup - it's a well known deficiency.

Fortunately we just need to clear the override file here. We can do that without needing to rename.

[Oliver Grawert (ogra)]

looks good

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-22 11:58:05 +0000
+++ debian/changelog	2015-09-10 14:03:14 +0000
@@ -1,3 +1,10 @@
+whoopsie-preferences (0.18) wily; urgency=medium
+
+  * Truncate the file manually if update-rc.d fails (e.g. on an r/o phone).
+  * Build with -Werror=implicit-function-declarations
+
+ -- Iain Lane <[e-mail]>  Thu, 10 Sep 2015 12:11:37 +0100
+
 whoopsie-preferences (0.17) wily; urgency=medium
 
   * Fall back to /etc/writable for /etc/whoopsie if we need to. Thanks seb128

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-07-19 13:38:07 +0000
+++ src/Makefile.am	2015-09-10 14:03:14 +0000
@@ -1,6 +1,8 @@
 bin_PROGRAMS = whoopsie-preferences
 lib_LTLIBRARIES = libwhoopsie-preferences.la
 
+AM_CFLAGS = -Werror=implicit-function-declaration
+
 pkgconfigdir = $(libdir)/pkgconfig
 policykitdir = $(datadir)/polkit-1/actions/
 dbussystemdir = $(sysconfdir)/dbus-1/system.d/
@@ -16,7 +18,8 @@
 	-Wall \
 	-g \
 	$(POLKIT_CFLAGS) $(GIO_UNIX_CFLAGS) \
-	$(LIBWHOOPSIE_CFLAGS)
+	$(LIBWHOOPSIE_CFLAGS) \
+	$(AM_CFLAGS)
 
 libwhoopsie_preferences_la_SOURCES = \
 	libwhoopsie-preferences.c \
@@ -33,7 +36,8 @@
 	-Wall \
 	-g \
 	$(POLKIT_CFLAGS) $(GIO_UNIX_CFLAGS) \
-	$(LIBWHOOPSIE_CFLAGS)
+	$(LIBWHOOPSIE_CFLAGS) \
+	$(AM_CFLAGS)
 
 whoopsie_preferences_SOURCES = \
 	whoopsie-preferences.c

=== modified file 'src/whoopsie-preferences.c'
--- src/whoopsie-preferences.c	2015-05-22 11:57:16 +0000
+++ src/whoopsie-preferences.c	2015-09-10 14:03:14 +0000
@@ -17,15 +17,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
 
-#include <stdio.h>
+#include <errno.h>
 #include <gio/gio.h>
+#include <glib/gstdio.h>
+#include <polkit/polkit.h>
+#include <stdio.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <polkit/polkit.h>
+#include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
 #include <unistd.h>
 
 #include <libwhoopsie/identifier.h>
@@ -130,6 +133,11 @@
 }
 
 static gboolean
+is_systemd() {
+    return g_file_test ("/run/systemd/system", G_FILE_TEST_IS_DIR);
+}
+
+static gboolean
 whoopsie_preferences_whoopsie_enabled (GError **error) {
     char* systemd_check_command[] = { "/bin/systemctl", "-q", "is-enabled", "whoopsie.service", NULL };
     gchar* upstart_override_content = NULL;
@@ -137,7 +145,7 @@
     int exit_code = 0;
 
     /* systemd running */
-    if (g_file_test ("/run/systemd/system", G_FILE_TEST_IS_DIR)) {
+    if (is_systemd()) {
         if (g_spawn_sync (NULL, systemd_check_command, NULL, 0, NULL, NULL, NULL, NULL, &exit_code, error))
             report_crashes = (exit_code == 0);
     }
@@ -304,9 +312,14 @@
     gboolean saved_value, new_value;
     GError* error = NULL;
     char* data;
+    char* errstr;
     gsize data_size;
     gboolean crashes = !g_strcmp0(user_data, "report_crashes");
     char* crash_enable_command[] = { "/usr/sbin/update-rc.d", "whoopsie", NULL, NULL };
+    char* initctl_reload_command[] = { "/sbin/initctl", "reload-configuration", NULL };
+    gboolean spawn_ok;
+    gint exit_status;
+    FILE* f = NULL;
 
     increase_shutdown_timeout ();
 
@@ -330,10 +343,35 @@
         error = NULL;
 
         if (crashes) {
-            if (!g_spawn_sync (NULL, crash_enable_command, NULL, 0, NULL, NULL, NULL, NULL, NULL, &error)) {
-                g_print ("Could not run invoke-rc.d: %s\n", error->message);
-                g_error_free (error);
-                return FALSE;
+            spawn_ok = g_spawn_sync (NULL, crash_enable_command, NULL, 0, NULL,
+                            NULL, NULL, NULL, &exit_status, &error);
+            if (!spawn_ok || exit_status != 0) {
+                if (error) {
+                    errstr = g_strdup (error->message);
+                    g_error_free (error);
+                } else
+                    errstr = g_strdup_printf ("exited with code %d", exit_status);
+                g_print ("Could not run update-rc.d: %s\n", errstr);
+                g_free (errstr);
+
+                /* It's a real error for systemd */
+                if (is_systemd())
+                    return FALSE;
+
+                /* Works for enabling (truncating) on upstart only atm */
+                if (new_value) {
+                    g_debug ("Truncating the override file manually");
+                    f = fopen ("/etc/init/whoopsie.override", "w");
+                    if (f) {
+                        fclose (f);
+			if (!g_spawn_sync (NULL, initctl_reload_command, NULL, 0, NULL,
+					NULL, NULL, NULL, &exit_status, &error))
+				g_print ("Could not run initctl reload-configuration: %s\n", errstr);
+		    } else {
+                        g_warning ("Couldn't open override file: %s", strerror(errno));
+                        return FALSE;
+                    }
+                }
             }
         } else {
             g_key_file_set_boolean (key_file, "General", user_data, new_value);