From 608e60099656f1185ebb9f0d2a39bb9056ab9858 Mon Sep 17 00:00:00 2001
From: wsp1991 <18601959171@163.com>
Date: Tue, 14 Jan 2020 10:35:16 +0800
Subject: [PATCH] delete some useless files

---
 glusterd.sysconfig   |   5 --
 glusterfs.spec       |  15 +++---
 glusterfsd.init      | 106 -------------------------------------------
 glusterfsd.sysconfig |   6 ---
 4 files changed, 7 insertions(+), 125 deletions(-)
 delete mode 100644 glusterd.sysconfig
 delete mode 100644 glusterfsd.init
 delete mode 100644 glusterfsd.sysconfig

diff --git a/glusterd.sysconfig b/glusterd.sysconfig
deleted file mode 100644
index d0e9c21..0000000
--- a/glusterd.sysconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# Change the glusterd service defaults here.
-# See "glusterd --help" outpout for defaults and possible values.
-
-#GLUSTERD_LOGFILE="/var/log/gluster/gluster.log"
-#GLUSTERD_LOGLEVEL="NORMAL"
diff --git a/glusterfs.spec b/glusterfs.spec
index f92acc3..0fa5a50 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -3,15 +3,12 @@
 
 Name:             glusterfs
 Version:          7.0
-Release:          1
+Release:          2
 License:          GPLv2 and LGPLv3+
 Summary:          Aggregating distributed file system
 URL:              http://docs.gluster.org/
 Source0:          https://download.gluster.org/pub/gluster/glusterfs/7/7.0/glusterfs-7.0.tar.gz
-Source1:          glusterd.sysconfig
-Source2:          glusterfsd.sysconfig
 Source7:          glusterfsd.service
-Source8:          glusterfsd.init
 
 BuildRequires:    systemd bison flex gcc make libtool ncurses-devel readline-devel libattr-devel
 BuildRequires:    libxml2-devel openssl-devel libaio-devel libacl-devel python3-devel git perl
@@ -128,8 +125,6 @@ make install DESTDIR=%{buildroot} docdir="%_docdir/%name"
 
 %delete_la_and_a
 
-install -D -p -m 0644 %{SOURCE1}  %{buildroot}%{_sysconfdir}/sysconfig/glusterd
-install -D -p -m 0644 %{SOURCE2}  %{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
 mkdir -p %{buildroot}%{_localstatedir}/log/{glusterd,glusterfs,glusterfsd}
 mkdir -p %{buildroot}%{_rundir}/gluster/metrics
 
@@ -353,8 +348,6 @@ exit 0
        %{_libdir}/*.so.*
 # sysconf
 %config(noreplace) %{_sysconfdir}/glusterfs
-%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
-%config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
 
 # init files
 %{_unitdir}/glusterd.service
@@ -457,6 +450,12 @@ exit 0
 %{_mandir}/man8/*gluster*.8*
 
 %changelog
+* Tue Jan 14 2020 renxudong<renxudong1@huawei.com> - 7.0-2
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:delete useless files
+
 * Sat Jan 11 2020 renxudong<renxudong1@huawei.com> - 7.0-1
 - Type:Upgrade
 - ID:NA
diff --git a/glusterfsd.init b/glusterfsd.init
deleted file mode 100644
index 1692989..0000000
--- a/glusterfsd.init
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-# glusterfsd   Startup script for the glusterfs server
-#
-# chkconfig:   - 20 80
-# description: Clustered file-system server
-
-### BEGIN INIT INFO
-# Provides: glusterfsd
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
-# Should-Start:
-# Should-Stop:
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: glusterfs server
-# Description:       Clustered file-system server
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-exec="/usr/sbin/glusterfsd"
-prog="glusterfsd"
-
-# Set defaults, then source config for eventual overrides
-GLUSTERFSD_NOFILE="65536"
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ $GLUSTERFSD_CONFIG -a -f $GLUSTERFSD_CONFIG ] || exit 6
-    ulimit -n $GLUSTERFSD_NOFILE
-    echo -n $"Starting $prog: "
-    daemon $exec${GLUSTERFSD_CONFIG+" -f $GLUSTERFSD_CONFIG"}${GLUSTERFSD_LOGFILE+" -l $GLUSTERFSD_LOGFILE"}${GLUSTERFSD_LOGLEVEL+" -L $GLUSTERFSD_LOGLEVEL"} -p /var/run/glusterfsd.pid
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc $prog
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    status $prog
-}
-
-rh_status_q() {
-    rh_status &>/dev/null
-}
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
-
diff --git a/glusterfsd.sysconfig b/glusterfsd.sysconfig
deleted file mode 100644
index b87deb1..0000000
--- a/glusterfsd.sysconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# Change the glusterfsd service defaults here.
-# See "glusterfsd --help" outpout for defaults and possible values.
-
-#GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfsd.vol"
-#GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfs.log"
-#GLUSTERFSD_LOGLEVEL="NORMAL"