diff -p -up mkinitrd-6.0.52/nash/Makefile.noselinux mkinitrd-6.0.52/nash/Makefile --- mkinitrd-6.0.52/nash/Makefile.noselinux 2008-04-25 17:24:00.000000000 +0200 +++ mkinitrd-6.0.52/nash/Makefile 2008-05-07 01:46:09.000000000 +0200 @@ -37,7 +37,7 @@ CFLAGS += $(shell pkg-config --cflags li 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 libdhcp glib-2.0) -lm # We need to link against libgcc_s directly, or it'll /dlopen() it during diff -p -up mkinitrd-6.0.52/nash/block.c.noselinux mkinitrd-6.0.52/nash/block.c --- mkinitrd-6.0.52/nash/block.c.noselinux 2008-04-25 17:24:00.000000000 +0200 +++ mkinitrd-6.0.52/nash/block.c 2008-05-07 01:45:23.000000000 +0200 @@ -35,7 +35,9 @@ #include <argz.h> #include <envz.h> +#ifdef SE_LINUX #include <selinux/selinux.h> +#endif #include <blkid/blkid.h> #include <linux/blkpg.h> diff -p -up mkinitrd-6.0.52/nash/nash.c.noselinux mkinitrd-6.0.52/nash/nash.c --- mkinitrd-6.0.52/nash/nash.c.noselinux 2008-04-25 17:24:00.000000000 +0200 +++ mkinitrd-6.0.52/nash/nash.c 2008-05-07 01:45:23.000000000 +0200 @@ -60,7 +60,9 @@ #include <libdevmapper.h> +#ifdef SE_LINUX #include <selinux/selinux.h> +#endif /* for showElfInterpCommand */ #include <gelf.h> @@ -1727,6 +1729,7 @@ mkdirCommand(char * cmd, char * end) } +#ifdef SE_LINUX static int loadPolicyCommand(char * cmd, char *end) { @@ -1773,6 +1776,7 @@ loadPolicyCommand(char * cmd, char *end) close(rootfd); return 0; } +#endif static int accessCommand(char * cmd, char * end) @@ -2875,7 +2879,9 @@ static const struct commandHandler handl { "find", findCommand }, { "kernelopt", printKernelOpt }, { "loadDrivers", loadDriversCommand }, +#ifdef SE_LINUX { "loadpolicy", loadPolicyCommand }, +#endif { "mkblktab", mkblktabCommand }, { "mkblkdevs", mkblkdevsCommand }, { "mkdir", mkdirCommand }, diff -p -up mkinitrd-6.0.52/bdevid/Makefile.noselinux mkinitrd-6.0.52/bdevid/Makefile --- mkinitrd-6.0.52/bdevid/Makefile.noselinux 2008-04-25 17:24:00.000000000 +0200 +++ mkinitrd-6.0.52/bdevid/Makefile 2008-05-07 01:45:23.000000000 +0200 @@ -23,13 +23,13 @@ export TOPDIR bdevid_OBJECTS = bdevid.o module.o probe.o sysfs.o probelib.o bdevid_LIBS := -L. -L$(TOPDIR)/nash -ldl bdevid_LIBS += $(shell pkg-config --libs glib-2.0) -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 += $(shell pkg-config --libs glib-2.0) -lbdevid -command_LIBS += -lnash -lparted -lblkid -luuid -ldevmapper -lselinux -lsepol +command_LIBS += -lnash -lparted -lblkid -luuid -ldevmapper MODULES = scsi ata usb OBJECTS = $(bdevid_OBJECTS) diff -p -up mkinitrd-6.0.52/grubby/Makefile.noselinux mkinitrd-6.0.52/grubby/Makefile --- mkinitrd-6.0.52/grubby/Makefile.noselinux 2008-04-25 17:24:00.000000000 +0200 +++ mkinitrd-6.0.52/grubby/Makefile 2008-05-07 01:45:23.000000000 +0200 @@ -32,7 +32,7 @@ LDFLAGS := -L$(TOPDIR)/nash -L$(TOPDIR)/ -Wl,--wrap,pipe grubby_LIBS = -lnash -lbdevid -grubby_LIBS += -lparted -lblkid -luuid -lpopt -ldevmapper -lselinux -lsepol +grubby_LIBS += -lparted -lblkid -luuid -lpopt -ldevmapper grubby_LIBS += $(shell pkg-config --libs libdhcp glib-2.0) test: all