From b7118f70ec026363a8dc05725d0014e28f5ebb95 Mon Sep 17 00:00:00 2001 From: Hinrikus Wolf <hinrikus@fsmpi.rwth-aachen.de> Date: Tue, 6 Sep 2016 17:38:43 +0200 Subject: [PATCH] tsm7: remove stupid ld-config for dsmc, add wrapper-script instead --- tsm7-client/files/dsmc | 9 +++++++++ tsm7-client/files/dsmc.service | 2 +- tsm7-client/tasks/main.yml | 11 +++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100755 tsm7-client/files/dsmc diff --git a/tsm7-client/files/dsmc b/tsm7-client/files/dsmc new file mode 100755 index 0000000..b72e001 --- /dev/null +++ b/tsm7-client/files/dsmc @@ -0,0 +1,9 @@ +#!/bin/bash + +export LD_LIBRARY_PATH="/opt/tivoli/tsm/client/ba/bin:/opt/tivoli/tsm/client/api/bin:/opt/tivoli/tsm/client/api/bin64/:/usr/local/ibm/gsk8/lib/:/usr/local/ibm/gsk8_64/lib64/:" +export LANG="en_US.utf-8" +export LC_CTYPE="en_US.utf-8" + +exec /usr/bin/dsmc $@ + + diff --git a/tsm7-client/files/dsmc.service b/tsm7-client/files/dsmc.service index 3c1a829..d431f7d 100644 --- a/tsm7-client/files/dsmc.service +++ b/tsm7-client/files/dsmc.service @@ -3,7 +3,7 @@ Description=Tivoli Storage Manager Sheduler Documentation=https://doc.itc.rwth-aachen.de/display/BURS/Home [Service] -ExecStart=/bin/sh -c "LANG=en_US.utf-8 LC_CTYPE=en_US.utf-8 exec /usr/bin/dsmc sched" +ExecStart=/usr/bin/local/dsmc sched PIDFile=/var/run/dsmcshed.pid [Install] diff --git a/tsm7-client/tasks/main.yml b/tsm7-client/tasks/main.yml index b4e968d..bc01953 100644 --- a/tsm7-client/tasks/main.yml +++ b/tsm7-client/tasks/main.yml @@ -62,9 +62,16 @@ - packages - tsm +- name: ensure special dsmc script is in place + copy: src=dsmc dest=/usr/local/bin/dsmc mode=0755 owner=root group=root + notify: + - restart tsm service + tags: + - tsm + - config -- name: ensure special ldconfig in place - copy: src=tsm-ld.so.conf dest=/etc/ld.so.conf.d/tsm-ld.so.conf +- name: ensure special ldconfig is absent + file: path=/etc/ld.so.conf.d/tsm-ld.so.conf state=absent notify: - ldconfig tsm - restart tsm service -- GitLab