From 23d34d1ca19f05603c0e22682c6194693e908735 Mon Sep 17 00:00:00 2001 From: Pascal Terjan <pterjan@mandriva.com> Date: Thu, 11 Jun 2009 00:33:40 +0200 Subject: [PATCH] Disable selinux --- bdevid/Makefile | 4 ++-- nash/Makefile | 2 +- nash/nash.c | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bdevid/Makefile b/bdevid/Makefile index cbd3bee..7958ca6 100644 --- a/bdevid/Makefile +++ b/bdevid/Makefile @@ -22,12 +22,12 @@ export TOPDIR bdevid_OBJECTS = bdevid.o module.o probe.o sysfs.o probelib.o bdevid_LIBS := -L. -L$(TOPDIR)/nash -ldl -bdevid_LIBS += -lnash -lparted -lblkid -luuid -ldevmapper -lselinux -lsepol +bdevid_LIBS += -lnash -lparted -lblkid -luuid -ldevmapper bdevidprobe_OBJECTS = probelib.o command_LIBS := -L. -L$(TOPDIR)/nash -lbdevid -ldl -command_LIBS += -lnash -lparted -lblkid -luuid -ldevmapper -lselinux -lsepol +command_LIBS += -lnash -lparted -lblkid -luuid -ldevmapper MODULES = scsi ata usb OBJECTS = $(bdevid_OBJECTS) diff --git a/nash/Makefile b/nash/Makefile index f1cceb7..03a77a7 100644 --- a/nash/Makefile +++ b/nash/Makefile @@ -37,7 +37,7 @@ CFLAGS += $(shell pkg-config --cflags libnl-1) LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/bdevid:$(TOPDIR)/nash nash_LIBPATHS = -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid -L/$(LIB) -nash_LIBS += -ldevmapper -lparted -lblkid -lselinux -lsepol +nash_LIBS += -ldevmapper -lparted -lblkid nash_LIBS += -luuid -lpopt -lresolv -ldl -lelf nash_LIBS += $(shell pkg-config --libs libnl-1) -lm # We need to link against libgcc_s directly, or it'll /dlopen() it during diff --git a/nash/nash.c b/nash/nash.c index 0daf281..12fe6cc 100644 --- a/nash/nash.c +++ b/nash/nash.c @@ -62,7 +62,9 @@ #include <libdevmapper.h> +#ifdef SE_LINUX #include <selinux/selinux.h> +#endif /* for showElfInterpCommand */ #include <gelf.h> @@ -1879,6 +1881,7 @@ mkdirCommand(char * cmd, char * end) } +#ifdef SE_LINUX static int loadPolicyCommand(char * cmd, char *end) { @@ -1925,6 +1928,7 @@ loadPolicyCommand(char * cmd, char *end) close(rootfd); return 0; } +#endif static int accessCommand(char * cmd, char * end) @@ -3265,7 +3269,9 @@ static const struct commandHandler handlers[] = { { "find", findCommand }, { "kernelopt", printKernelOpt }, { "loadDrivers", loadDriversCommand }, +#ifdef SE_LINUX { "loadpolicy", loadPolicyCommand }, +#endif { "mkchardevs", mkchardevsCommand }, { "mkblktab", mkblktabCommand }, { "mkblkdevs", mkblkdevsCommand }, -- 1.7.1