Whamcloud - gitweb
LU-10869 build: package configuration files for Ubuntu / Debian 50/31850/6
authorJames Simmons <uja.ornl@yahoo.com>
Fri, 6 Apr 2018 16:06:35 +0000 (12:06 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Thu, 19 Apr 2018 04:38:45 +0000 (04:38 +0000)
For a long time Lustre never added /etc configuration files to its
debian packages. It could get away with but now you can see it
fail conf-sanity test 76a. This test the lctl set_param -P which
uses udev events to set the tunables for lustre. In order for it
to work a default udev rule has to be added to 99-lustre.rules.
Beside the missing 99-lustre.rules and in all the other files used
for configuration. Lastly create conffile which is the way Debian
handles potential stomping of configuration files. When installing
with apt-get install it will ask the person installing if they
want to over ride specific files.

Test-Parameters: clientdistro=ubuntu1604 trivial testlist=conf-sanity
Test-Parameters: envdefinitions=ONLY=76a testlist=conf-sanity

Change-Id: Ic0aaf2bba531ce23a3e23ef070a1501032ad1c9f
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/31850
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Thomas Stibor <t.stibor@gsi.de>
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
debian/lustre-client-utils.conffiles [new file with mode: 0644]
debian/lustre-client-utils.install
debian/lustre-server-utils.conffiles [new file with mode: 0644]
debian/lustre-server-utils.install
debian/rules

diff --git a/debian/lustre-client-utils.conffiles b/debian/lustre-client-utils.conffiles
new file mode 100644 (file)
index 0000000..164a7d9
--- /dev/null
@@ -0,0 +1,4 @@
+/etc/lnet.conf
+/etc/lnet_routes.conf
+/etc/modprobe.d/ko2iblnd.conf
+/etc/udev/rules.d/99-lustre.rules
index ae8149d..7f737cf 100644 (file)
@@ -2,3 +2,5 @@ debian/tmp/sbin/*                       sbin
 debian/tmp/usr/sbin/*                  usr/sbin
 debian/tmp/usr/bin/*                   usr/bin
 debian/tmp/usr/lib/*.so.*              usr/lib
+debian/tmp/lib/systemd/system/*        lib/systemd/system
+debian/tmp/etc/*                       etc
diff --git a/debian/lustre-server-utils.conffiles b/debian/lustre-server-utils.conffiles
new file mode 100644 (file)
index 0000000..fd49053
--- /dev/null
@@ -0,0 +1,5 @@
+/etc/ldev.conf
+/etc/lnet.conf
+/etc/lnet_routes.conf
+/etc/modprobe.d/ko2iblnd.conf
+/etc/udev/rules.d/99-lustre.rules
index 1f12be6..148f5b5 100644 (file)
@@ -2,4 +2,6 @@ debian/tmp/sbin/*                       sbin
 debian/tmp/usr/sbin/*                  usr/sbin
 debian/tmp/usr/bin/*                   usr/bin
 debian/tmp/usr/lib/*.so.*              usr/lib
-debian/tmp/usr/lib/lustre/*.so*                usr/lib/lustre
+debian/tmp/usr/lib/lustre/*.so*        usr/lib/lustre
+debian/tmp/lib/systemd/system/*        lib/systemd/system
+debian/tmp/etc/*                       etc
index 66cf294..237904a 100755 (executable)
@@ -415,7 +415,7 @@ binary-modules: prep-deb-files
        $(MAKE) $(PMAKEARGS)
        $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PKGNAME)
        # Remove stuff that doesn't belong (no module-only target)
-       cd $(CURDIR)/debian/$(PKGNAME) && rm -rf usr/bin usr/sbin usr/lib usr/share usr/include/lustre sbin etc
+       cd $(CURDIR)/debian/$(PKGNAME) && rm -rf usr/bin usr/sbin usr/lib usr/share usr/include/lustre lib/systemd sbin etc
        dh_installdocs -p$(PKGNAME)
        dh_installchangelogs -p$(PKGNAME)
        dh_installmodules -p $(PKGNAME)