From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49E59158649 for ; Thu, 11 May 2023 15:53:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88644E0D1A; Thu, 11 May 2023 15:53:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6255DE0D1A for ; Thu, 11 May 2023 15:53:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82D84340BB4 for ; Thu, 11 May 2023 15:53:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9CF5A59 for ; Thu, 11 May 2023 15:53:06 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1683820384.059ec0a93b0dd016eff133a3c7f940d9986b5be9.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/glusterfs/files/glusterd-10.2-r1.initd sys-cluster/glusterfs/files/glusterd-r4.initd sys-cluster/glusterfs/files/glusterfs-r1.initd X-VCS-Directories: sys-cluster/glusterfs/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 059ec0a93b0dd016eff133a3c7f940d9986b5be9 X-VCS-Branch: master Date: Thu, 11 May 2023 15:53:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 347a6d5e-46c8-491c-a1a4-6be96e0c97ef X-Archives-Hash: c6112e5fbf66095a2a2a740beb00f338 commit: 059ec0a93b0dd016eff133a3c7f940d9986b5be9 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu May 11 15:49:03 2023 +0000 Commit: Joonas Niilola gentoo 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 levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30998 Signed-off-by: Joonas Niilola 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} -}