commit: 059ec0a93b0dd016eff133a3c7f940d9986b5be9 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu May 11 15:49:03 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu May 11 15:53:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059ec0a9
sys-cluster/glusterfs: remove unused files Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30998 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-cluster/glusterfs/files/glusterd-10.2-r1.initd | 32 ------ sys-cluster/glusterfs/files/glusterd-r4.initd | 32 ------ sys-cluster/glusterfs/files/glusterfs-r1.initd | 121 --------------------- 3 files changed, 185 deletions(-) diff --git a/sys-cluster/glusterfs/files/glusterd-10.2-r1.initd b/sys-cluster/glusterfs/files/glusterd-10.2-r1.initd deleted file mode 100644 index f5210ef7cd1c..000000000000 --- a/sys-cluster/glusterfs/files/glusterd-10.2-r1.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Gluster elastic volume management daemon" -command="/usr/sbin/glusterd" -pidfile="/run/${SVCNAME}.pid" -command_args="-N" - -command_background="yes" - -depend() { - need net - before netmount -} - -start_pre() { - # Ensure that the GlusterFS auxiliary mount parent directory exists - checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster -} - -start_post() { - local c=0 - ebegin "Waiting for glusterd to start up" - while ! /usr/sbin/gluster volume list >/dev/null 2>&1 && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do - (( c=c+1 )) - done - [ "${c}" -lt "${glusterd_max_wait_start-60}" ] - eend $? - - return 0 -} diff --git a/sys-cluster/glusterfs/files/glusterd-r4.initd b/sys-cluster/glusterfs/files/glusterd-r4.initd deleted file mode 100644 index ba4749aef072..000000000000 --- a/sys-cluster/glusterfs/files/glusterd-r4.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Gluster elastic volume management daemon" -command="/usr/sbin/glusterd" -pidfile="/run/${SVCNAME}.pid" -command_args="-N" - -command_background="yes" - -depend() { - need net - before netmount -} - -start_pre() { - # Ensure that the GlusterFS auxiliary mount parent directory exists - checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster -} - -start_post() { - local c=0 - ebegin "Waiting for glusterd to start up" - while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do - (( ++c )) - done - [ "${c}" -lt "${glusterd_max_wait_start-60}" ] - eend $? - - return 0 -} diff --git a/sys-cluster/glusterfs/files/glusterfs-r1.initd b/sys-cluster/glusterfs/files/glusterfs-r1.initd deleted file mode 100644 index c2845855cf9c..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-r1.initd +++ /dev/null @@ -1,121 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -if [[ "${SVCNAME}" != "glusterfs" ]] -then - GLUSTERFS_NAME="${SVCNAME#glusterfs.}" -else - GLUSTERFS_NAME="glusterfs" -fi - -GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid" - -eval 'GLUSTERFS_LOGFILE="${'${GLUSTERFS_NAME}'_log:-/var/log/glusterfs/'${GLUSTERFS_NAME}'.log}"' -eval 'GLUSTERFS_VOLFILE="${'${GLUSTERFS_NAME}'_vol:-/etc/glusterfs/'${GLUSTERFS_NAME}'.vol}"' -eval 'GLUSTERFS_SERVER="${'${GLUSTERFS_NAME}'_server}"' -eval 'GLUSTERFS_PORT="${'${GLUSTERFS_NAME}'_port:-6996}"' -eval 'GLUSTERFS_TRANSPORT="${'${GLUSTERFS_NAME}'_transport:-socket}"' -eval 'GLUSTERFS_OPTS="${'${GLUSTERFS_NAME}'_opts}"' -eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"' - -depend() { - need net - [[ -n "${GLUSTERFS_MOUNTPOINT}" ]] && need fuse - use dns - before netmount - after firewall ntp-client ntpd -} - -checkconfig() { - if [[ -z "${GLUSTERFS_NAME}" ]] - then - eerror "The service name is not properly formatted." - return 1 - fi - - if [[ -z "${GLUSTERFS_SERVER}" ]] - then - if [[ -z "${GLUSTERFS_VOLFILE}" ]] - then - eerror "No GlusterFS volume file source has been defined. Edit /etc/conf.d/glusterfs" - eerror "and configure a volume file source for ${SVCNAME}." - return 1 - else - if [[ ! -f "${GLUSTERFS_VOLFILE}" ]] - then - eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}" - return 1 - fi - fi - fi - - if [[ -n "${GLUSTERFS_MOUNTPOINT}" && ! -d "${GLUSTERFS_MOUNTPOINT}" ]] - then - eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist." - return 1 - fi -} - -start() { - local status daemon - - checkconfig || return 1 - - ebegin "Starting GlusterFS (${SVCNAME})" - eindent - - if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]] - then - einfo "Starting in server mode ..." - daemon="glusterfsd" - else - einfo "Starting in client mode. Mounting filesystem ..." - daemon="glusterfs" - fi - - if [[ -n "${GLUSTERFS_SERVER}" ]] - then - einfo "Using server supplied volume file" - start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \ - --exec /usr/sbin/${daemon} -- \ - --pid-file=${GLUSTERFS_PIDFILE} \ - --log-file=${GLUSTERFS_LOGFILE} \ - --volfile-server=${GLUSTERFS_SERVER} \ - --volfile-server-port=${GLUSTERFS_PORT} \ - --volfile-server-transport=${GLUSTERFS_TRANSPORT} \ - ${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT} - status="$?" - else - einfo "Using local volume file" - start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \ - --exec /usr/sbin/${daemon} -- \ - --pid-file=${GLUSTERFS_PIDFILE} \ - --log-file=${GLUSTERFS_LOGFILE} \ - --volfile=${GLUSTERFS_VOLFILE} \ - ${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT} - status="$?" - fi - - eoutdent - eend ${status} -} - -stop() { - local status - - ebegin "Stopping GlusterFS (${SVCNAME})" - eindent - if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]] - then - einfo "Stopping server process ..." - start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE} - status="$?" - else - einfo "Unmounting ${GLUSTERFS_MOUNTPOINT} ..." - umount "${GLUSTERFS_MOUNTPOINT}" - status="$?" - fi - eoutdent - eend ${status} -}
