- disable obdctl from being built; use lctl now

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index d7913b3..5b7caea 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -62,7 +62,7 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
 
 
 %files
-%attr(-, root, root) /usr/sbin/obdctl
+#%attr(-, root, root) /usr/sbin/obdctl
 %attr(-, root, root) /usr/sbin/lctl
 %attr(-, root, root) /usr/sbin/llsetup.sh
 %attr(-, root, root) /usr/sbin/llrsetup.sh

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 0320ff2..fe857ac 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -7,7 +7,7 @@ KFLAGS:=
 CPPFLAGS = $(HAVE_LIBREADLINE)
 obdctl_LDADD := $(LIBREADLINE) -lxml2 # -lefence
 lctl_LDADD := $(LIBREADLINE)
-sbin_PROGRAMS = lctl obdctl
+sbin_PROGRAMS = lctl
 obdctl_SOURCES = parser.c obdctl.c parser.h
 lctl_SOURCES = parser.c network.c device.c debug.c lctl.c lctl.h parser.h