- install setup scripts and config

diff --git a/lustre/lib/Makefile.am b/lustre/lib/Makefile.am
index 6212722..31cdfa9 100644 (file)
--- a/lustre/lib/Makefile.am
+++ b/lustre/lib/Makefile.am
@@ -1,3 +1,4 @@
-EXTRA_DIST = mds_updates.c obd_pack.c page.c ll_pack.c l_lock.c simple.c l_net.c
+EXTRA_DIST = mds_updates.c obd_pack.c page.c ll_pack.c l_lock.c simple.c l_net.c\
+       lov_pack.c
 
 include $(top_srcdir)/Rules

diff --git a/lustre/lov/.cvsignore b/lustre/lov/.cvsignore
index 282522d..e995588 100644 (file)
--- a/lustre/lov/.cvsignore
+++ b/lustre/lov/.cvsignore
@@ -1,2 +1,3 @@
+.deps
 Makefile
 Makefile.in

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index bb67b7a..3585e58 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -3,7 +3,7 @@
 %define kversion @RELEASE@
 %define linuxdir @LINUX@
 %define portalsdir @PORTALS@
-Release: 1
+Release: 2
 
 Summary: Lustre Lite File System
 Name: lustre-lite
@@ -20,6 +20,7 @@ servers and utilities.
 
 %package -n lustre-modules
 Summary: Kernel Lustre drivers for Linux %{kversion}
+Requires: portals-modules
 Group: Development/Kernel
 
 %description -n lustre-modules
@@ -55,16 +56,13 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/obd-%{version}
 %files
 %attr(-, root, root) %doc COPYING FDL
 %attr(-, root, root) %doc doc/master.pdf doc/lustre-HOWTO.txt
-%attr(-, root, root) /usr/bin/directio
-%attr(-, root, root) /usr/bin/fsx
-%attr(-, root, root) /usr/bin/mcreate
-%attr(-, root, root) /usr/bin/obdctl
-%attr(-, root, root) /usr/bin/openme
-%attr(-, root, root) /usr/bin/openunlink
-%attr(-, root, root) /usr/bin/tchmod
-%attr(-, root, root) /usr/bin/toexcl
-%attr(-, root, root) /usr/bin/truncate
-%attr(-, root, root) /usr/bin/writeme
+%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
+%attr(-, root, root) /usr/sbin/llcleanup.sh
+%attr(-, root, root) /lib/lustre/common.sh
+%attr(-, root, root) /etc/lustre/lustre.cfg
 
 %files -n lustre-modules
 %attr(-, root, root) %doc COPYING

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 58d5d83..d2947f1 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -3,7 +3,13 @@ CPPFLAGS := -I. -I$(PORTALS)/include -I$(top_srcdir)/include -D_LARGEFILE64_SOUR
 CFLAGS := -g -Wall
 # LDADD = -lldap
 # LDADD := -lreadline -ltermcap # -lefence
-bin_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate tchmod toexcl fsx #ldaptest 
+pkglibdir = @libdir@/lustre
+pkgcfgdir = @sysconfdir@/lustre
+EXTRA_DIST = llsetup.sh llrsetup.sh llcleanup.sh common.sh lustre.cfg
+sbin_SCRIPTS = llsetup.sh llrsetup.sh llcleanup.sh
+pkglib_SCRIPTS = common.sh
+pkgcfg_DATA = lustre.cfg
+noinst_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate tchmod toexcl fsx #ldaptest 
 
 # ldaptest_SOURCES = ldaptest.c
 tchmod_SOURCES = tchmod.c

diff --git a/lustre/tests/lustre.cfg b/lustre/tests/lustre.cfg
new file mode 100644 (file)
index 0000000..889088f
--- /dev/null
+++ b/lustre/tests/lustre.cfg
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Config file for running tests on a single host over loopback TCP
+NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
+
+# Config file for setting up a metadata server
+MDSFS=extN
+MDSDEV=/tmp/mds
+MDSSIZE=25000
+SETUP_MDS=y
+# LOVUUID=LovUUID
+
+# Config file for mounting a client Lustre filesystem
+SETUP_MDC=y
+SETUP_OSC=y
+OSCMT=/mnt/lustre
+SETUP_MOUNT=y
+
+# Config file for setting up an object storage target with obdfilter
+OSTDEV=/tmp/ost
+OSTSIZE=10000
+OSTFS=extN
+OSTTYPE=obdfilter
+SETUP_OST=y

diff --git a/lustre/utils/.cvsignore b/lustre/utils/.cvsignore
index 9aab7fa..1820e08 100644 (file)
--- a/lustre/utils/.cvsignore
+++ b/lustre/utils/.cvsignore
@@ -8,3 +8,4 @@ Makefile.in
 tags
 TAGS
 obdctl
+lctl