Merge pull request #20 from cgwalters/centos7-build-fixes

Build on CentOS7 (Project Atomic C7 Continuous rdgo)

Author: rhatdan

.dir-locals.el

@@ -0,0 +1 @@
+((c-mode . ((indent-tabs-mode . t) (c-file-style . "linux"))))

Makefile.am

@@ -1,7 +1,7 @@
 libexec_PROGRAMS = oci-systemd-hook
 oci_systemd_hook_SOURCES= src/systemdhook.c
 
-oci_systemd_hook_CFLAGS = $(YAJL_CFLAGS)
+oci_systemd_hook_CFLAGS = -std=c99 $(YAJL_CFLAGS)
 oci_systemd_hook_LDADD = $(YAJL_LIBS)
 oci_systemd_hook_CFLAGS += $(SELINUX_CFLAGS)
 oci_systemd_hook_LDADD += $(SELINUX_LIBS)

configure.ac

@@ -3,10 +3,13 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror subdir-objects])
 AC_PROG_CC
+AM_PROG_CC_C_O
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 
 PKG_CHECK_MODULES([YAJL], [yajl >= 2.0.0])
 PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.0.0])
-PKG_CHECK_MODULES([LIBMOUNT], [mount >= 2.27.0])
+PKG_CHECK_MODULES([LIBMOUNT], [mount >= 2.23.0])
 
 AC_MSG_CHECKING([whether to disable argument checking])
 AC_ARG_ENABLE([args], AS_HELP_STRING([--disable-args], [disable checking that cmd args are either init/systemd]))

src/systemdhook.c

@@ -232,7 +232,6 @@ static char *get_process_cgroup_subsystem_path(int pid, const char *subsystem) {
 	ssize_t read;
 	size_t len = 0;
 	char *ptr;
-	char *path;
 	char *subsystem_path = NULL;
 	while ((read = getline(&line, &len, fp)) != -1) {
 		pr_pdebug("%s", line);
@@ -411,7 +410,7 @@ static int prestart(const char *rootfs,
 		}
 
 		if (strcmp("", mount_label)) {
-			rc = setfilecon(journal_dir, mount_label);
+			rc = setfilecon(journal_dir, (security_context_t)mount_label);
 			if (rc < 0) {
 				pr_perror("Failed to set journal dir selinux context");
 				return -1;
@@ -508,7 +507,6 @@ int main(int argc, char *argv[])
 	char errbuf[BUFLEN];
 	char stateData[CONFIGSZ];
 	char configData[CONFIGSZ];
-	int ret = -1;
 	_cleanup_fclose_ FILE *fp = NULL;
 
 	stateData[0] = 0;