From bc84624a373657b09074d2e4446e28ef5a4f167ff0b9c6f1f4acf9e9034a7088 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 6 Feb 2023 00:24:55 +0000 Subject: [PATCH] - Rename all drop-in options.conf files as 10-options.conf This makes it easier for other packages to over-ride with a drop-in with a later sequence number. resource-agents does this. (bsc#1207843) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=270 --- nfs-utils.changes | 9 +++++++++ nfs-utils.spec | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 6d66083..8e6de11 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 6 00:23:05 UTC 2023 - Neil Brown + +- Rename all drop-in options.conf files as 10-options.conf + This makes it easier for other packages to over-ride + with a drop-in with a later sequence number. + resource-agents does this. + (bsc#1207843) + ------------------------------------------------------------------- Tue Nov 22 00:27:06 UTC 2022 - Neil Brown diff --git a/nfs-utils.spec b/nfs-utils.spec index 7fab0b8..9d2e523 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,7 +1,7 @@ # # spec file for package nfs-utils # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -149,12 +149,12 @@ make %{?_smp_mflags} %install make %{?_smp_mflags} DESTDIR=%{buildroot} install find %{buildroot} -type f -name '*.la' -delete -print -install -D -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/nfs-mountd.service.d/options.conf -install -D -m 644 %{SOURCE21} %{buildroot}%{_unitdir}/nfs-server.service.d/options.conf -install -D -m 644 %{SOURCE22} %{buildroot}%{_unitdir}/rpc-gssd.service.d/options.conf -install -D -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/rpc-statd.service.d/options.conf -install -D -m 644 %{SOURCE24} %{buildroot}%{_unitdir}/rpc-statd-notify.service.d/options.conf -install -D -m 644 %{SOURCE25} %{buildroot}%{_unitdir}/rpc-svcgssd.service.d/options.conf +install -D -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/nfs-mountd.service.d/10-options.conf +install -D -m 644 %{SOURCE21} %{buildroot}%{_unitdir}/nfs-server.service.d/10-options.conf +install -D -m 644 %{SOURCE22} %{buildroot}%{_unitdir}/rpc-gssd.service.d/10-options.conf +install -D -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/rpc-statd.service.d/10-options.conf +install -D -m 644 %{SOURCE24} %{buildroot}%{_unitdir}/rpc-statd-notify.service.d/10-options.conf +install -D -m 644 %{SOURCE25} %{buildroot}%{_unitdir}/rpc-svcgssd.service.d/10-options.conf install -D -m 644 %{SOURCE26} %{buildroot}%{_sysconfdir}/nfs.conf install -D -m 644 %{SOURCE27} %{buildroot}%{_prefix}/lib/tmpfiles.d/nfs-kernel-server.conf ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-server