Yaniv Bronhaim has uploaded a new change for review. Change subject: Removing support in sysv and upstart ......................................................................
Removing support in sysv and upstart sysvinit scripts used to support rhel >=6.6. upstart scripts used to support debian. Both not required in later versions. systemd scripts become the standard in fedora rhel and debian. Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Signed-off-by: Yaniv Bronhaim <[email protected]> --- M configure.ac M init/Makefile.am D init/sysvinit/Makefile.am D init/sysvinit/respawn D init/sysvinit/supervdsmd.init.in D init/sysvinit/vdsmd.init.in D init/upstart/Makefile.am D init/upstart/supervdsmd.upstart.in D init/upstart/vdsm-tmpfiles.upstart.in D init/upstart/vdsmd.upstart.in 10 files changed, 1 insertion(+), 659 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/40726/1 diff --git a/configure.ac b/configure.ac index 4e6943a..e1d2544 100644 --- a/configure.ac +++ b/configure.ac @@ -341,8 +341,6 @@ debian/Makefile init/Makefile init/systemd/Makefile - init/sysvinit/Makefile - init/upstart/Makefile lib/Makefile lib/vdsm/Makefile lib/vdsm/netlink/Makefile diff --git a/init/Makefile.am b/init/Makefile.am index 15a5c03..62a226b 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # -SUBDIRS = systemd sysvinit upstart +SUBDIRS = systemd include $(top_srcdir)/build-aux/Makefile.subs diff --git a/init/sysvinit/Makefile.am b/init/sysvinit/Makefile.am deleted file mode 100644 index 7beba50..0000000 --- a/init/sysvinit/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2008-2012 Red Hat, 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 -# - -include $(top_srcdir)/build-aux/Makefile.subs - -nodist_noinst_DATA = \ - supervdsmd.init \ - vdsmd.init \ - $(NULL) - -dist_vdsm_SCRIPTS = \ - respawn \ - $(NULL) - -CLEANFILES = \ - config.log \ - $(nodist_noinst_DATA) \ - $(NULL) - -EXTRA_DIST = \ - supervdsmd.init.in \ - vdsmd.init.in \ - $(NULL) - -all-local: \ - $(nodist_noinst_DATA) \ - $(NULL) diff --git a/init/sysvinit/respawn b/init/sysvinit/respawn deleted file mode 100755 index d13effc..0000000 --- a/init/sysvinit/respawn +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -e - -# Copyright 2010 Red Hat, Inc. and/or its affiliates. -# Released under GPL v2 -# -# Author: Dan Kenigsberg <[email protected]> -# -# Please contact me if something similar, but more standard, is available. - -MINLIFETIME=2 -MAX_THRASH_INTERVAL=30 -POST_FAIL_INTERVAL=900 - -usage() { - echo usage: - echo "$0 [options] <slave> [args]" - echo " --masterpid pidfile" - echo " --slavepid pidfile" - echo " --daemon" - echo " --minlifetime seconds" - echo " --thrash seconds" - echo - echo "make <slave> run, and respawn it on exit" - exit 1 -} - -while [ "$1" != "${1##-}" ]; -do - case "$1" in - --minlifetime) - MINLIFETIME="$2" - shift 2 - ;; - --thrash) - MAX_THRASH_INTERVAL="$2" - shift 2 - ;; - --masterpid) - masterpidfile="$2" - shift 2 - ;; - --slavepid) - slavepidfile="$2" - shift 2 - ;; - --daemon) - daemonize=1 - shift - ;; - --) - shift - break - ;; - *) usage - ;; - esac -done - -if [ -z "$*" ]; -then - usage -fi - -loop() { - local d0 d1 - local thrash_start - - # must use BASHPID since $$ is not updated by & - [ ! -z "$masterpidfile" ] && echo $BASHPID > "$masterpidfile" - d0=`date +%s` - while true - do - "$@" & - [ ! -z "$slavepidfile" ] && echo $! > "$slavepidfile" - wait $! || : - d1=`date +%s` - if [ $[d1-d0] -lt "$MINLIFETIME" ]; - then - if [[ -n "$thrash_start" ]] && \ - [[ $[d1-thrash_start] -gt "$MAX_THRASH_INTERVAL" ]]; then - logger -t respawn -- "slave '$*' died too quickly for more than $MAX_THRASH_INTERVAL seconds, master sleeping for $POST_FAIL_INTERVAL seconds" - thrash_start= - sleep "$POST_FAIL_INTERVAL" - else - logger -t respawn -- "slave '$*' died too quickly, respawning slave" - [[ -z "$thrash_start" ]] && thrash_start=$d1 - fi - else - logger -t respawn -- "slave '$*' died, respawning slave" - thrash_start= - fi - d0=$d1 - done -} - -if [ -z "$daemonize" ]; -then - loop "$@" -else - loop "$@" >/dev/null 2>/dev/null & -fi diff --git a/init/sysvinit/supervdsmd.init.in b/init/sysvinit/supervdsmd.init.in deleted file mode 100755 index f3369c2..0000000 --- a/init/sysvinit/supervdsmd.init.in +++ /dev/null @@ -1,116 +0,0 @@ -#! /bin/sh -# -# Copyright 2006-2013 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under 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. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# - -# chkconfig: 2345 99 00 -# -### BEGIN INIT INFO -# Provides: supervdsmd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: init script for the Super VDS management server -# Short-Description: init script for the Super VDS management server -### END INIT INFO - -SUPERVDSM_BIN=@VDSMDIR@/supervdsmServer -PIDFILE=@VDSMRUNDIR@/supervdsmd.pid -RESPAWNPIDFILE=@VDSMRUNDIR@/supervdsm_respawn.pid -SOCKFILE=@VDSMRUNDIR@/svdsm.sock -prog=supervdsm - -[ -f /etc/sysconfig/supervdsmd ] && . /etc/sysconfig/supervdsmd -. /etc/init.d/functions - -log_failure_msg() { echo -n "$@"; failure "$@"; echo; } -log_success_msg() { echo -n "$@"; success "$@"; echo; } - -RETVAL=0 - -start(){ - test_already_running && return 0 - - DAEMON_COREFILE_LIMIT=unlimited daemon \ - "@VDSMDIR@/daemonAdapter" -0 /dev/null -1 /dev/null -2 /dev/null \ - "@VDSMDIR@/respawn" --minlifetime 10 --daemon \ - --masterpid "${RESPAWNPIDFILE}" "${SUPERVDSM_BIN}" \ - --sockfile "${SOCKFILE}" --pidfile "${PIDFILE}" - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg "$prog start" || log_failure_msg "$prog start" -} - -test_already_running() -{ - if pidofproc -p $RESPAWNPIDFILE >/dev/null || \ - pidofproc -p $PIDFILE $SUPERVDSM_BIN >/dev/null; then - log_success_msg "$prog: already running" - return 0 - fi - return 1 -} - -stop(){ - echo "Shutting down supervdsm daemon: " - if killproc -p "$RESPAWNPIDFILE"; then - log_success_msg "$prog watchdog stop" - fi - if ! pidofproc -p "$PIDFILE" >/dev/null; then - log_failure_msg "$prog: not running" - RETVAL=0 - else - killproc -p "$PIDFILE" -d 2 - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg "$prog stop" || log_failure_msg "$prog stop" - fi - return "$RETVAL" -} - -case "$1" in - start) - start - RETVAL=$? - ;; - stop) - stop - RETVAL=$? - ;; - status) - pidofproc -p "$PIDFILE" "$SUPERVDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - echo "Super VDSM daemon server is running" - else - echo -n "Super VDSM daemon is not running" - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then - echo ", but its watchdog is" - else - echo - fi - fi - ;; - condrestart) - pidofproc -p "$PIDFILE" "$SUPERVDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - $0 stop && $0 start; - RETVAL=$?; - fi; - ;; - try-restart|restart|force-reload) - $0 stop && $0 start - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|status|restart|condrestart|force-reload|try-restart}" - RETVAL=2 -esac - -exit "$RETVAL" - - - diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in deleted file mode 100755 index 6edd89f..0000000 --- a/init/sysvinit/vdsmd.init.in +++ /dev/null @@ -1,270 +0,0 @@ -#! /bin/sh -# -# Copyright 2006-2010 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under 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. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# - -# chkconfig: 2345 99 00 -# -### BEGIN INIT INFO -# Provides: vdsmd -# Required-Start: $syslog $network -# Should-Start: $time -# Required-Stop: $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: init script for the VDS management server -# Short-Description: init script for the VDS management server -### END INIT INFO - -VDSM_BIN="@VDSMDIR@/vdsm" -prog=vdsm -PIDFILE=@VDSMRUNDIR@/vdsmd.pid -RESPAWNPIDFILE=@VDSMRUNDIR@/respawn.pid -NEEDED_SERVICES="multipathd rpcbind ntpd wdmd sanlock libvirtd supervdsmd" -CONFLICTING_SERVICES="libvirt-guests ksmtuned" -LOCK_FILE="/var/lock/subsys/vdsmd" -VDSM_TOOL="@BINDIR@/vdsm-tool" -NICE_LOWEST=-20 -VDSMD_INIT_COMMON="@LIBEXECDIR@/vdsmd_init_common.sh" -RETVAL=0 - -SYSTEMCTL_SKIP_REDIRECT=true - -[ -f /etc/sysconfig/vdsm ] && . /etc/sysconfig/vdsm -. /etc/init.d/functions - -log_failure_msg() { printf "$@"; failure "$@"; echo; } -log_success_msg() { printf "$@"; success "$@"; echo; } - -shutdown_conflicting_srv() { - local srv - local ret_val - local conflicting_services="$1" - - for srv in ${conflicting_services}; do - if initctl status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - initctl stop "${srv}" || : # stop fails when already down - initctl status "${srv}" | grep -q stop/waiting - elif [ -x "/etc/init.d/${srv}" ]; then - if service "${srv}" status >/dev/null 2>&1; then - service "${srv}" stop - fi - else - true - fi - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Stop conflicting ${srv}" - return "${ret_val}" - fi - done - return 0 -} - -start_needed_srv() { - local srv - local ret_val - local needed_services="$1" - - for srv in ${needed_services}; do - if initctl status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - initctl start "${srv}" || : # start fails when already running - initctl status "${srv}" | grep -q start/running - else - service "${srv}" status >/dev/null 2>&1 || service "${srv}" start - fi - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Start dependent ${srv}" - return "${ret_val}" - fi - done -} - -start_network() { - # Check if there are unactivated VDSM devices - local interfaces dev static_devs activated_devs - - pushd /etc/sysconfig/network-scripts/ > /dev/null - - # copied from /etc/init.d/network - interfaces=$(ls ifcfg-* | \ - LC_ALL=C sed -e "$__sed_discard_ignored_files" \ - -e '/\(ifcfg-lo$\|:\|ifcfg-.*-range\)/d' \ - -e '{ s/^ifcfg-//g;s/[0-9]/ &/}' | \ - LC_ALL=C sort -k 1,1 -k 2n | \ - LC_ALL=C sed 's/ //') - - for dev in $interfaces; do - ifcfg="ifcfg-$dev" - grep -q '# Generated by VDSM version' "$ifcfg" || continue - grep -q 'ONBOOT=yes' "$ifcfg" || continue - static_devs="$static_devs $dev" - done - popd > /dev/null - - activated_devs="`service network status | tail -1`" - - for static_dev in $static_devs; do - if [[ $activated_devs != *"$static_dev"* ]]; then - service network start - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Start dependent network" - return "${ret_val}" - fi - break - fi - done -} - -test_already_running() -{ - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null || \ - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null; then - log_success_msg "$prog: already running" - return 0 - fi - return 1 -} - -reconfigure() { - if [ "${1}" = "force" ] || ! "$VDSM_TOOL" is-configured; then - "$VDSM_TOOL" configure "--force" - fi -} - -restore_nets(){ - "$VDSM_TOOL" restore-nets - return 0 -} - -unified_network_persistence_upgrade(){ - echo 'Upgrading to unified persistence if needed' - "$VDSM_TOOL" ${UPGRADE_LOGGING_PARAMS} upgrade-unified-persistence -} - -upgrade_300_nets(){ - echo 'Upgrading to v3.x networking if needed' - "$VDSM_TOOL" ${UPGRADE_LOGGING_PARAMS} upgrade-3.0.0-networks -} - -start() { - test_already_running && return 0 - - start_network || return 1 - shutdown_conflicting_srv "${CONFLICTING_SERVICES}" || return 1 - start_needed_srv "${NEEDED_SERVICES}" || return 1 - - # "service iscsid start" may not start becasue we configure node.startup to - # manual. See /etc/init.d/iscsid. - service iscsid status >/dev/null 2>&1 || service iscsid force-start \ - || return 1 - - "${VDSMD_INIT_COMMON}" --pre-start || return 1 - - unified_network_persistence_upgrade || return 1 - restore_nets || return 1 - upgrade_300_nets || return 1 - - - echo $"Starting up vdsm daemon: " - DAEMON_COREFILE_LIMIT=unlimited NICELEVEL="${NICE_LOWEST}" daemon \ - --user=vdsm "@VDSMDIR@/daemonAdapter" -0 /dev/null -1 /dev/null \ - -2 /dev/null --syslog "@VDSMDIR@/respawn" --minlifetime 10 \ - --daemon --masterpid "${RESPAWNPIDFILE}" "${VDSM_BIN}" \ - --pidfile "${PIDFILE}" || return 1 - touch "${LOCK_FILE}" - return 0 -} - -stop() { - echo $"Shutting down vdsm daemon: " - if killproc -p "$RESPAWNPIDFILE"; then - log_success_msg $"$prog watchdog stop" - fi - if ! pidofproc -p "$PIDFILE" >/dev/null; then - log_failure_msg "$prog: not running" - RETVAL=0 - else - killproc -p "$PIDFILE" -d @SERVICE_STOP_TIMEOUT@ - RETVAL=$? - [ "$RETVAL" = 0 ] && "@RM_PATH@" -f "$LOCK_FILE" > /dev/null 2>&1 - fi - "${VDSMD_INIT_COMMON}" --post-stop - return "$RETVAL" -} - -lock_op() { - { - if ! flock -n 9; then - log_failure_msg $"cannot ${1} ${prog}, operation is locked" - false - elif ( "${1}" 9<&- ); then - log_success_msg $"${prog} ${1}" - else - log_failure_msg $"${prog} ${1}" - false - fi - } 9<$0 -} - -case "$1" in - start) - lock_op start - RETVAL=$? - ;; - stop) - lock_op stop - RETVAL=$? - ;; - status) - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - echo "VDS daemon server is running" - else - printf "VDS daemon is not running" - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then - echo ", and its watchdog is running" - else - echo - fi - fi - ;; - condrestart) - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - "$0" stop && "$0" start; - RETVAL=$?; - fi; - ;; - try-restart) - "$0" stop && "$0" start - RETVAL=$? - ;; - restart|force-reload) - "$0" stop - "$0" start - RETVAL=$? - ;; - reconfigure) - # Jump over 'reconfigure' - shift 1 - reconfigure "$@" - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|status|restart|force-reload|try-restart|condrestart}" - RETVAL=2 -esac - -exit "$RETVAL" diff --git a/init/upstart/Makefile.am b/init/upstart/Makefile.am deleted file mode 100644 index e689fdf..0000000 --- a/init/upstart/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# -# 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 -# - -include $(top_srcdir)/build-aux/Makefile.subs - -nodist_noinst_DATA = \ - supervdsmd.upstart \ - vdsm-tmpfiles.upstart \ - vdsmd.upstart \ - $(NULL) - -CLEANFILES = \ - config.log \ - $(nodist_noinst_DATA) \ - $(NULL) - -EXTRA_DIST = \ - supervdsmd.upstart.in \ - vdsm-tmpfiles.upstart.in \ - vdsmd.upstart.in \ - $(NULL) - -all-local: \ - $(nodist_noinst_DATA) \ - $(NULL) diff --git a/init/upstart/supervdsmd.upstart.in b/init/upstart/supervdsmd.upstart.in deleted file mode 100644 index bc55702..0000000 --- a/init/upstart/supervdsmd.upstart.in +++ /dev/null @@ -1,20 +0,0 @@ -# supervdsmd - Auxiliary vdsm service for running helper functions as root -# - -description "Auxiliary vdsm service for running helper functions as root" - -start on runlevel [2345] and started libvirt-bin -stop on runlevel [!2345] -chdir "@VDSMDIR@" -console log -respawn - -# All commands called inside this script section except the daemon itself -# should not fork, otherwise Upstart traces the wrong pid. -# ".", "[", "&&" are built-in command or key-word, no fork. -# bash exec does not fork, just execve the target binary. -# So no "expect" stanza is needed. -script - [ -f "/etc/default/supervdsmd" ] && . "/etc/default/supervdsmd" - exec "@VDSMDIR@/daemonAdapter" "@VDSMDIR@/supervdsmServer" --sockfile "@VDSMRUNDIR@/svdsm.sock" -end script diff --git a/init/upstart/vdsm-tmpfiles.upstart.in b/init/upstart/vdsm-tmpfiles.upstart.in deleted file mode 100644 index a0b6b73..0000000 --- a/init/upstart/vdsm-tmpfiles.upstart.in +++ /dev/null @@ -1,24 +0,0 @@ -# vdsm-tmpfiles - Automatically create tempfiles under /var/run for vdsm -# - -description "Automatically create tempfiles under /var/run for vdsm" - -start on startup -console log - -task - -script -while read fileType filePath fileMode fileUser fileGroup ; do - if [ ! -e "$filePath" ]; then - if [ "$fileType" = "d" ]; then - @MKDIR_P@ "$filePath" - else - echo "Type $fileType handling is not implemented" - exit 1 - fi - fi - "@CHOWN_PATH@" $fileUser:$fileGroup "$filePath" - "@CHMOD_PATH@" $fileMode "$filePath" -done < "@CONFDIR@/vdsm-tmpfiles.conf" -end script diff --git a/init/upstart/vdsmd.upstart.in b/init/upstart/vdsmd.upstart.in deleted file mode 100644 index 1eab48b..0000000 --- a/init/upstart/vdsmd.upstart.in +++ /dev/null @@ -1,39 +0,0 @@ -# vdsmd - Virtual Desktop Server Manager -# - -description "Virtual Desktop Server Manager" - -start on runlevel [2345] and started networking and started portmap and started libvirt-bin and started supervdsmd -stop on runlevel [!2345] -kill timeout @SERVICE_STOP_TIMEOUT@ -chdir "@VDSMDIR@" -console log -nice -20 -respawn - -pre-start script - "@BINDIR@/vdsm-tool" load-needed-modules - service wdmd restart - for srv in networking ntp open-iscsi multipath-tools wdmd sanlock portmap libvirt-bin supervdsmd; do - if status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - start "${srv}" || true - status "${srv}" | grep -q start/running - else - service "${srv}" status >/dev/null 2>&1 || service "${srv}" start - fi - done - "@LIBEXECDIR@/vdsmd_init_common.sh" --pre-start -end script - -# All commands called inside this script section except the daemon itself -# should not fork, otherwise Upstart traces the wrong pid. -# ".", "[", "&&" are built-in command or key-word, no fork. -# bash exec does not fork, just execve the target binary. -# So no "expect" stanza is needed. -script - [ -f "/etc/default/vdsmd" ] && . "/etc/default/vdsmd" - exec start-stop-daemon --chuid @VDSMUSER@:@VDSMGROUP@ --start --exec "@VDSMDIR@/daemonAdapter" -- -0 /dev/null -1 /dev/null -2 /dev/null "@VDSMDIR@/vdsm" -end script - -post-stop exec "@LIBEXECDIR@/vdsmd_init_common.sh" --post-stop -- To view, visit https://gerrit.ovirt.org/40726 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
