Change in vdsm[master]: packaging: eliminate /usr/lib/systemd/systemd-vdsmd

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has uploaded a new change for review.

Change subject: packaging: eliminate /usr/lib/systemd/systemd-vdsmd
......................................................................

packaging: eliminate /usr/lib/systemd/systemd-vdsmd

This script was introduced many years ago (commit c01a733c) as a helper
to the makeshift systemd service. Mistakenly, it was not removed by
commit ad15e459 that introduced a proper systemd service. This patch
drops the long-dead code.

Change-Id: I04bd7e8acfbbfb5a0ec2cfc0239a243624083bf1
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M .gitignore
M init/systemd/Makefile.am
D init/systemd/systemd-vdsmd.in
M vdsm.spec.in
4 files changed, 0 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/79153/1

diff --git a/.gitignore b/.gitignore
index 0f8849c..9937872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@
 configure
 cscope.out
 doc/build
-init/systemd/systemd-vdsmd
 init/systemd/vdsm-tmpfiles.d.conf
 init/vdsmd_init_common.sh
 lib/vdsm/api/vdsm-api.html
diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am
index 2ff6be8..8f1e12b 100644
--- a/init/systemd/Makefile.am
+++ b/init/systemd/Makefile.am
@@ -21,7 +21,6 @@
 include $(top_srcdir)/build-aux/Makefile.subs
 
 nodist_noinst_DATA = \
-	systemd-vdsmd \
 	vdsm-tmpfiles.d.conf \
 	$(NULL)
 
@@ -32,7 +31,6 @@
 
 EXTRA_DIST = \
 	85-vdsmd.preset \
-	systemd-vdsmd.in \
 	vdsm-tmpfiles.d.conf.in \
 	unlimited-core.conf \
 	$(NULL)
diff --git a/init/systemd/systemd-vdsmd.in b/init/systemd/systemd-vdsmd.in
deleted file mode 100644
index a502b62..0000000
--- a/init/systemd/systemd-vdsmd.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright 2013 IBM, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Refer to the README and COPYING files for full details of the license
-#
-
-usage_exit(){
-    echo 'Usage: systemd-vdsmd reconfigure [force]' >&2
-    exit 1
-}
-
-[ "$1" != "reconfigure" ] && usage_exit
-[ -n "$2" -a "$2" != "force" ] && usage_exit
-
-if [ "$2" = "force" ] || ! "@BINDIR@/vdsm-tool"
is-configured; then
-    "@BINDIR@/vdsm-tool" configure --force
-fi
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 4dc79f7..fb899fd 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -735,7 +735,6 @@
 install -Dm 0644 lib/vdsm/storage/vdsm-lvm.rules \
                  %{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules
 
-install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}%{_libdir}/systemd/systemd-vdsmd
 install -Dm 0644 init/systemd/85-vdsmd.preset %{buildroot}%{_presetdir}/85-vdsmd.preset
 
 install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \
@@ -858,7 +857,6 @@
 %doc lib/vdsm/vdsm.conf.sample
 %doc README.logging
 %license COPYING
-%{_libdir}/systemd/systemd-vdsmd
 %{_presetdir}/85-vdsmd.preset
 %{_unitdir}/dev-hugepages1G.mount
 %{_unitdir}/vdsmd.service


-- 
To view, visit https://gerrit.ovirt.org/79153
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04bd7e8acfbbfb5a0ec2cfc0239a243624083bf1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has posted comments on this change.

Change subject: packaging: eliminate /usr/lib/systemd/systemd-vdsmd
......................................................................


Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.ovirt.org/79153
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I04bd7e8acfbbfb5a0ec2cfc0239a243624083bf1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No