packaging: additional dirs and files in /var/lib/glusterd/
Add the missing /var/lib/glusterd files and dirs found by
downstream testing. Use a loop to create hook dirs instead
of open-coding. Merge the %ghost and non-ghost dirs in
-server %files section for easier maintenance.
Eliminate a benign warning for enabling non-existent
glusterfsd.{init,service} which is only relevant to Fedora
builds
Don't reject glusterfs.spec.in changes because of long lines
Change-Id: I5802175d729e0168eea879a2a61626b0b73d77c8
BUG: 1326410
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/13981
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
This commit is contained in:
Kaleb S KEITHLEY
Kaleb KEITHLEY
parent
a9b78f1ebe
commit
1866836749
@ -2083,6 +2083,8 @@ sub process {
|
||||
"Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
|
||||
}
|
||||
|
||||
# check we are in .spec file, then ignore this hunk
|
||||
next if ($realfile eq "glusterfs.spec.in");
|
||||
|
||||
# check we are in a valid source file if not then ignore this hunk
|
||||
next if ($realfile !~ /\.(h|c|pl|py|l|y|sh|in)$/);
|
||||
|
||||
@ -151,12 +151,12 @@
|
||||
|
||||
|
||||
##-----------------------------------------------------------------------------
|
||||
## All package definitions should be placed here and keep them sorted
|
||||
## All package definitions should be placed here in alphabetical order
|
||||
##
|
||||
Summary: Distributed File System
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Name: glusterfs
|
||||
Version: 3.5.0
|
||||
Version: 3.8.0
|
||||
Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
|
||||
Vendor: Fedora Project
|
||||
%else
|
||||
@ -688,33 +688,19 @@ install -D -p -m 0644 extras/glusterfs-georep-logrotate \
|
||||
# the rest of the ghosts
|
||||
touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
|
||||
touch %{buildroot}%{_sharedstatedir}/glusterd/options
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/post
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/pre
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/pre
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/post
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/pre
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/pre
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/post
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/pre
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre
|
||||
subdirs=(add-brick create copy-file delete gsync-create remove-brick reset set start stop)
|
||||
for dir in ${subdirs[@]}; do
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/"$dir"/{pre,post}
|
||||
done
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/glustershd
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/peers
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/vols
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/bitd
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/quotad
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/scrub
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/snaps
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/ss_brick
|
||||
touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol
|
||||
touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid
|
||||
|
||||
@ -724,6 +710,7 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus
|
||||
install -p -m 0744 -D extras/command-completion/gluster.bash \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/gluster
|
||||
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/glusterfind/.keys
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
@ -761,7 +748,9 @@ exit 0
|
||||
%post server
|
||||
# Legacy server
|
||||
%_init_enable glusterd
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
%_init_enable glusterfsd
|
||||
%endif
|
||||
# ".cmd_log_history" is renamed to "cmd_history.log" in GlusterFS-3.7 .
|
||||
# While upgrading glusterfs-server package form GlusterFS version <= 3.6 to
|
||||
# GlusterFS version 3.7, ".cmd_log_history" should be renamed to
|
||||
@ -1001,35 +990,37 @@ exit 0
|
||||
|
||||
%files ganesha
|
||||
%{_sysconfdir}/ganesha/*
|
||||
%attr(0755,-,-) %{_libexecdir}/ganesha/*
|
||||
%attr(0755,-,-) %{_prefix}/lib/ocf/resource.d/heartbeat/*
|
||||
%{_libexecdir}/ganesha/*
|
||||
%{_prefix}/lib/ocf/resource.d/heartbeat/*
|
||||
%{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/reset/post/S31ganesha-reset.sh
|
||||
|
||||
%if ( 0%{!?_without_georeplication:1} )
|
||||
%files geo-replication
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-georep
|
||||
|
||||
%{_sbindir}/gfind_missing_files
|
||||
%{_libexecdir}/glusterfs/gsyncd
|
||||
%{_libexecdir}/glusterfs/python/syncdaemon/*
|
||||
%{_libexecdir}/glusterfs/gverify.sh
|
||||
%{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh
|
||||
%{_libexecdir}/glusterfs/peer_gsec_create
|
||||
%{_libexecdir}/glusterfs/peer_mountbroker
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
|
||||
%dir %{_sharedstatedir}/glusterd/hooks
|
||||
%dir %{_sharedstatedir}/glusterd/hooks/1
|
||||
%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create
|
||||
%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post
|
||||
%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh
|
||||
%{_libexecdir}/glusterfs/gfind_missing_files
|
||||
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
|
||||
%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre
|
||||
|
||||
%{_datadir}/glusterfs/scripts/get-gfid.sh
|
||||
%{_datadir}/glusterfs/scripts/slave-upgrade.sh
|
||||
%{_datadir}/glusterfs/scripts/gsync-upgrade.sh
|
||||
%{_datadir}/glusterfs/scripts/generate-gfid-file.sh
|
||||
%{_datadir}/glusterfs/scripts/gsync-sync-gfid
|
||||
%{_datadir}/glusterfs/scripts/schedule_georep.py*
|
||||
%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
|
||||
%{_libexecdir}/glusterfs/gfind_missing_files
|
||||
%{_sbindir}/gfind_missing_files
|
||||
%endif
|
||||
|
||||
%files libs
|
||||
@ -1064,28 +1055,19 @@ exit 0
|
||||
|
||||
%files server
|
||||
%doc extras/clear_xattrs.sh
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
|
||||
# sysconf
|
||||
%config(noreplace) %{_sysconfdir}/glusterfs
|
||||
%dir %{_sharedstatedir}/glusterd
|
||||
%dir %{_sharedstatedir}/glusterd/groups
|
||||
%config(noreplace) %{_sharedstatedir}/glusterd/groups/virt
|
||||
# Legacy configs
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
|
||||
%endif
|
||||
%{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/set/post/S30samba-set.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/start/post/S29CTDBsetup.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/start/post/S30samba-start.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh
|
||||
%{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh
|
||||
|
||||
# init files
|
||||
%_init_glusterd
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
%_init_glusterfsd
|
||||
%endif
|
||||
|
||||
# binaries
|
||||
%{_sbindir}/glusterd
|
||||
%{_sbindir}/glfsheal
|
||||
@ -1119,49 +1101,66 @@ exit 0
|
||||
%{_libdir}/libgfdb.so.*
|
||||
%endif
|
||||
|
||||
#snap_scheduler
|
||||
# snap_scheduler
|
||||
%{_sbindir}/snap_scheduler.py
|
||||
%{_sbindir}/gcron.py
|
||||
|
||||
#hookscripts
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset/post
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
|
||||
|
||||
%ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
|
||||
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
|
||||
# This is really ugly, but I have no idea how to mark these directories in
|
||||
# any other way. They should belong to the glusterfs-server package, but
|
||||
# don't exist after installation. They are generated on the first start...
|
||||
# /var/lib/glusterd, e.g. hookscripts, etc.
|
||||
%ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/bitd
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups
|
||||
%attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/virt
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind/.keys
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file/post
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file/pre
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset/post
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset/pre
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post/S30samba-set.sh
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/pre
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post/S29CTDBsetup.sh
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post/S30samba-start.sh
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
|
||||
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh
|
||||
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs
|
||||
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
|
||||
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
|
||||
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/snap
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/ss_bricks
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols
|
||||
|
||||
# Extra utility script
|
||||
%{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
|
||||
@ -1170,7 +1169,6 @@ exit 0
|
||||
%{_libexecdir}/glusterfs/glusterfind
|
||||
%{_bindir}/glusterfind
|
||||
%{_libexecdir}/glusterfs/peer_add_secret_pub
|
||||
%{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py
|
||||
|
||||
%if ( 0%{?_with_firewalld:1} )
|
||||
/usr/lib/firewalld/services/glusterfs.xml
|
||||
@ -1180,6 +1178,9 @@ exit 0
|
||||
%{_sbindir}/gf_recon
|
||||
|
||||
%changelog
|
||||
* Tue Apr 12 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
||||
- additional dirs and files in /var/lib/glusterd/... (#1326410)
|
||||
|
||||
* Mon Mar 7 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
||||
- %%pre, %%post etc. scriptlet cleanup, ... -p /sbin/ldconfig (#1315024)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user