diff -p -up mkinitrd-6.0.62/nash/Makefile.nonetwork mkinitrd-6.0.62/nash/Makefile --- mkinitrd-6.0.62/nash/Makefile.nonetwork 2008-08-19 15:19:30.000000000 +0200 +++ mkinitrd-6.0.62/nash/Makefile 2008-08-19 15:19:30.000000000 +0200 @@ -22,7 +22,7 @@ export TOPDIR LIBS = libnash.so TARGETS = nash libnash.pc -OBJECTS = util.o linkdetect.o nash.o network.o nfsmount.o \ +OBJECTS = util.o linkdetect.o nash.o nfsmount.o \ nfsmount_clnt.o nfsmount_xdr.o dns.o block_priv.o \ waitdev.o @@ -32,14 +32,14 @@ libnash_OBJECTS = lib.o hotplug.o wrap.o include ../Makefile.inc CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include -CFLAGS += $(shell pkg-config --cflags libdhcp glib-2.0) +CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/bdevid:$(TOPDIR)/nash nash_LIBPATHS = -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid -L/$(LIB) nash_LIBS += -ldevmapper -lparted -lblkid nash_LIBS += -luuid -lpopt -lresolv -ldl -lelf -nash_LIBS += $(shell pkg-config --libs libdhcp glib-2.0) -lm +nash_LIBS += $(shell pkg-config --libs glib-2.0) -lm # We need to link against libgcc_s directly, or it'll /dlopen() it during # backtrace()! This is not teh way!!!1!!!one!!!. nash_LIBS += -lgcc_s diff -p -up mkinitrd-6.0.62/nash/nash.c.nonetwork mkinitrd-6.0.62/nash/nash.c --- mkinitrd-6.0.62/nash/nash.c.nonetwork 2008-08-19 15:19:30.000000000 +0200 +++ mkinitrd-6.0.62/nash/nash.c 2008-08-19 15:20:06.000000000 +0200 @@ -2768,6 +2768,7 @@ condCommand(char *cmd, char *end) return rc; } +/* static int networkCommand(char *cmd, char *end) { @@ -2776,7 +2777,9 @@ networkCommand(char *cmd, char *end) int rc; size_t len; +*/ /* popt expects to get network --args here */ +/* if (!cmd || cmd >= end) return 1; @@ -2791,6 +2794,7 @@ networkCommand(char *cmd, char *end) free(ncmd); return rc; } +*/ static int nullCommand(char *cmd, char *end) @@ -3047,7 +3051,9 @@ static const struct commandHandler handl { "mknod", mknodCommand }, { "mkrootdev", mkrootdevCommand }, { "mount", mountCommand }, + /* { "network", networkCommand }, + */ { "null", nullCommand }, { "plymouth", nullCommand }, { "hotplug", hotplugCommand },