summaryrefslogtreecommitdiff
path: root/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2017-08-05 10:58:48 +0000
committerKoop Mast <kwm@FreeBSD.org>2017-08-05 10:58:48 +0000
commite18e2ae3c04a5012efb089b152a0d558c8110371 (patch)
tree5237d3d5922af476695ecaa49d7957cf8cd37191 /sysutils/consolekit/files/patch-tools_ck-log-system-start.c
parentExplicitly build with -std=gnu++11. (diff)
Update consolekit to 1.2.0.
* Rename consolekit to consolekit2 to reflect that consolekit2 is a new project, even if it the continuation of the old consolekit project. * Expand pkg-descr with some background info. * Add license * ConsoleKit2 has been ported to GDbus, so dbus-glib is not anymore required * Add GObject introspection support for desktops environment such Pantheon or Deepin. * Thanks to Jesper Schmitz Mouridsen, Ben Woods and Olivier Duchateau for assisting with there versions of the port, suggesting changes and testing. PR: 202269
Diffstat (limited to '')
-rw-r--r--sysutils/consolekit/files/patch-tools_ck-log-system-start.c60
1 files changed, 0 insertions, 60 deletions
diff --git a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
deleted file mode 100644
index 0e125ef262d2..000000000000
--- a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- tools/ck-log-system-start.c.orig 2009-09-14 20:08:10.000000000 -0400
-+++ tools/ck-log-system-start.c 2009-09-26 01:35:37.000000000 -0400
-@@ -26,6 +26,9 @@
- #include <unistd.h>
- #include <errno.h>
- #include <fcntl.h>
-+#ifdef __FreeBSD__
-+#include <kenv.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/utsname.h>
-@@ -41,7 +44,9 @@
-
- #define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history"
-
-+#ifdef __linux__
- #define LINUX_KERNEL_CMDLINE "/proc/cmdline"
-+#endif
-
- /* Adapted from auditd auditd-event.c */
- static gboolean
-@@ -162,6 +167,7 @@ write_log_for_event (CkLogEvent *event)
- static char *
- get_boot_arguments (void)
- {
-+#if defined(__linux__)
- char *contents;
- gboolean res;
-
-@@ -178,6 +184,29 @@ get_boot_arguments (void)
- }
-
- return contents;
-+#elif defined(__FreeBSD__)
-+ char kern_name[1024], root[1024], mopts[1024];
-+ char *options;
-+
-+ options = NULL;
-+ if (kenv(KENV_GET, "kernelname", kern_name, sizeof (kern_name)) == -1) {
-+ return options;
-+ }
-+
-+ if (kenv(KENV_GET, "vfs.root.mountfrom.options", mopts, sizeof (mopts)) == -1) {
-+ g_strlcpy (mopts, "ro", sizeof (mopts));
-+ }
-+
-+ if (kenv(KENV_GET, "vfs.root.mountfrom", root, sizeof (root)) == -1) {
-+ g_strlcpy (root, "/", sizeof (root));
-+ }
-+
-+ options = g_strdup_printf ("%s %s root=%s", mopts, kern_name, root);
-+
-+ return options;
-+#else
-+ return NULL;
-+#endif
- }
-
- int