--- mkinitrd-5.0.10/nash/Makefile.dm-notyet~ 2005-12-04 14:05:54.000000000 +0100 +++ mkinitrd-5.0.10/nash/Makefile 2005-12-04 14:05:54.000000000 +0100 @@ -5,13 +5,13 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) -LIBS=-ldevmapper -lparted -luuid -ldl +LIBS=-luuid -ldl LDFLAGS=$(CFLAGS) -static mandir=usr/share/man -nash: nash.o mount_by_label.o name_to_dev_t.o dm.o +nash: nash.o mount_by_label.o name_to_dev_t.o $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) clean: --- mkinitrd-5.0.10/nash/nash.c.dm-notyet~ 2005-12-04 14:05:54.000000000 +0100 +++ mkinitrd-5.0.10/nash/nash.c 2005-12-04 14:07:06.000000000 +0100 @@ -1973,6 +1973,7 @@ return -1; } +#if 0 /* not yet */ static int dmCommand(char *cmd, char *end) { @@ -2029,12 +2030,10 @@ if (nashDmCreatePartitions(name)) return 0; return 1; -#if 0 /* not yet */ } else if (!strcmp(action, "partdel")) { if (nashDmRemovePartitions(name)) return 0; return 1; -#endif } usage: eprintf("usage: dm create name start length type PARAMS...\n"); @@ -2045,6 +2044,7 @@ #endif return 1; } +#endif static int mkDMNodCommand(char * cmd, char * end) @@ -2205,7 +2205,9 @@ #ifdef DEBUG { "cat", catCommand }, #endif +#if 0 { "dm", dmCommand }, +#endif { "echo", echoCommand }, { "exec", execCommand }, { "find", findCommand },