From e1c9c27ca26fe2242bca15acae45b3943d46b509a04c7038f5ca756abab39e4f Mon Sep 17 00:00:00 2001 From: Anna Maresova Date: Thu, 9 Sep 2010 15:02:08 +0000 Subject: [PATCH 1/7] - add port settings to sysconfig (bnc#637382) OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=7 --- quota-SUSE.tar.bz2 | 4 ++-- quota.changes | 5 +++++ quota.spec | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/quota-SUSE.tar.bz2 b/quota-SUSE.tar.bz2 index a5d2a35..feddf13 100644 --- a/quota-SUSE.tar.bz2 +++ b/quota-SUSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a667d05b602e2f31c915dae90c2b3194c3ebee76092629bacda83a1c9db640a -size 4029 +oid sha256:60c09f9ff1d62cc00a5dc3a75f189bb6e5063d04dd0e4926eadbc2795835b66c +size 4259 diff --git a/quota.changes b/quota.changes index 01ebcb9..1202ee7 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 9 16:59:51 CEST 2010 - anicka@suse.cz + +- add port settings to sysconfig (bnc#637382) + ------------------------------------------------------------------- Wed Jun 23 08:15:39 UTC 2010 - mseben@novell.com diff --git a/quota.spec b/quota.spec index b662eef..fd02969 100644 --- a/quota.spec +++ b/quota.spec @@ -98,6 +98,7 @@ make CC="gcc" %install install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 755 ${RPM_BUILD_ROOT}/sbin +install -d -m 755 ${RPM_BUILD_ROOT}/var/adm/fillup-templates make install ROOTDIR=${RPM_BUILD_ROOT} #quotactl.2 manual page was moved from quota to man-pages[bnc#587393] rm ${RPM_BUILD_ROOT}/%{_mandir}/man?/quotactl.* @@ -110,15 +111,16 @@ cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d #ln -s ../../etc/init.d/quota ${RPM_BUILD_ROOT}/usr/sbin/rcquota ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad %find_lang %{name} +cp SUSE/rquotad.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.rquotad %clean rm -rf $RPM_BUILD_ROOT %post -%{fillup_and_insserv -y boot.quota} +%{fillup_and_insserv -f -y boot.quota} %post nfs -%{fillup_and_insserv quotad} +%{fillup_and_insserv -n rquotad quotad} %preun %stop_on_removal boot.quota @@ -152,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT %doc SUSE/README.quotad.SUSE %{_sbindir}/rpc.rquotad %{_sbindir}/rcquotad +/var/adm/fillup-templates/sysconfig.rquotad # these files conflicts with glibc rpm %exclude /usr/include/rpcsvc/* From ea1a2f61368838fb49c4231ee9c72c05848cadf3d94e9456ec6809764df55cf7 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 21 Sep 2010 10:34:47 +0000 Subject: [PATCH 2/7] Accepting request 47612 from Base:System checked in (request 47612) OBS-URL: https://build.opensuse.org/request/show/47612 OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=8 --- quota-SUSE.tar.bz2 | 4 ++-- quota.changes | 5 ----- quota.spec | 7 ++----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/quota-SUSE.tar.bz2 b/quota-SUSE.tar.bz2 index feddf13..a5d2a35 100644 --- a/quota-SUSE.tar.bz2 +++ b/quota-SUSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60c09f9ff1d62cc00a5dc3a75f189bb6e5063d04dd0e4926eadbc2795835b66c -size 4259 +oid sha256:0a667d05b602e2f31c915dae90c2b3194c3ebee76092629bacda83a1c9db640a +size 4029 diff --git a/quota.changes b/quota.changes index 1202ee7..01ebcb9 100644 --- a/quota.changes +++ b/quota.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 9 16:59:51 CEST 2010 - anicka@suse.cz - -- add port settings to sysconfig (bnc#637382) - ------------------------------------------------------------------- Wed Jun 23 08:15:39 UTC 2010 - mseben@novell.com diff --git a/quota.spec b/quota.spec index fd02969..b662eef 100644 --- a/quota.spec +++ b/quota.spec @@ -98,7 +98,6 @@ make CC="gcc" %install install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 755 ${RPM_BUILD_ROOT}/sbin -install -d -m 755 ${RPM_BUILD_ROOT}/var/adm/fillup-templates make install ROOTDIR=${RPM_BUILD_ROOT} #quotactl.2 manual page was moved from quota to man-pages[bnc#587393] rm ${RPM_BUILD_ROOT}/%{_mandir}/man?/quotactl.* @@ -111,16 +110,15 @@ cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d #ln -s ../../etc/init.d/quota ${RPM_BUILD_ROOT}/usr/sbin/rcquota ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad %find_lang %{name} -cp SUSE/rquotad.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.rquotad %clean rm -rf $RPM_BUILD_ROOT %post -%{fillup_and_insserv -f -y boot.quota} +%{fillup_and_insserv -y boot.quota} %post nfs -%{fillup_and_insserv -n rquotad quotad} +%{fillup_and_insserv quotad} %preun %stop_on_removal boot.quota @@ -154,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT %doc SUSE/README.quotad.SUSE %{_sbindir}/rpc.rquotad %{_sbindir}/rcquotad -/var/adm/fillup-templates/sysconfig.rquotad # these files conflicts with glibc rpm %exclude /usr/include/rpcsvc/* From 5702ee550978e38be0ec9f997307c565f914b755c3ceb1d9ec0c6160a46398f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Thu, 17 Feb 2011 12:51:37 +0000 Subject: [PATCH 3/7] Accepting request 61597 from home:vitezslav_cizek:branches:Base:System self accept OBS-URL: https://build.opensuse.org/request/show/61597 OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=9 --- quota-SUSE.tar.bz2 | 4 ++-- quota.changes | 5 +++++ quota.spec | 10 +++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/quota-SUSE.tar.bz2 b/quota-SUSE.tar.bz2 index a5d2a35..709109e 100644 --- a/quota-SUSE.tar.bz2 +++ b/quota-SUSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a667d05b602e2f31c915dae90c2b3194c3ebee76092629bacda83a1c9db640a -size 4029 +oid sha256:546c9b9d1c51c5b3780f62a3a6ab723efbe1d858e08ff504ab5bd51be777a22c +size 4290 diff --git a/quota.changes b/quota.changes index 01ebcb9..1202ee7 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 9 16:59:51 CEST 2010 - anicka@suse.cz + +- add port settings to sysconfig (bnc#637382) + ------------------------------------------------------------------- Wed Jun 23 08:15:39 UTC 2010 - mseben@novell.com diff --git a/quota.spec b/quota.spec index b662eef..500c848 100644 --- a/quota.spec +++ b/quota.spec @@ -21,7 +21,7 @@ Name: quota BuildRequires: dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel Version: 3.17 -Release: 3 +Release: 10 PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Group: System/Filesystems @@ -98,6 +98,7 @@ make CC="gcc" %install install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 755 ${RPM_BUILD_ROOT}/sbin +install -d -m 755 ${RPM_BUILD_ROOT}/var/adm/fillup-templates make install ROOTDIR=${RPM_BUILD_ROOT} #quotactl.2 manual page was moved from quota to man-pages[bnc#587393] rm ${RPM_BUILD_ROOT}/%{_mandir}/man?/quotactl.* @@ -110,15 +111,17 @@ cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d #ln -s ../../etc/init.d/quota ${RPM_BUILD_ROOT}/usr/sbin/rcquota ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad %find_lang %{name} +cp SUSE/sysconfig.nfs-quota $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.nfs-quota %clean rm -rf $RPM_BUILD_ROOT %post -%{fillup_and_insserv -y boot.quota} +%{fillup_and_insserv -f -y boot.quota} %post nfs -%{fillup_and_insserv quotad} +%{fillup_and_insserv -an nfs quotad} +#%{fillup_only -an nfs} %preun %stop_on_removal boot.quota @@ -152,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT %doc SUSE/README.quotad.SUSE %{_sbindir}/rpc.rquotad %{_sbindir}/rcquotad +%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-quota # these files conflicts with glibc rpm %exclude /usr/include/rpcsvc/* From 3689ec924e4de52cd7a505c2ecde29f2a024b3773570b36d8bad4935e88c3098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Thu, 17 Feb 2011 13:08:48 +0000 Subject: [PATCH 4/7] moved port settings to sysconfig/nfs (bnc#637382) updated documentation accordingly OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=10 --- quota-SUSE.tar.bz2 | 4 ++-- quota.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/quota-SUSE.tar.bz2 b/quota-SUSE.tar.bz2 index 709109e..1608b85 100644 --- a/quota-SUSE.tar.bz2 +++ b/quota-SUSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:546c9b9d1c51c5b3780f62a3a6ab723efbe1d858e08ff504ab5bd51be777a22c -size 4290 +oid sha256:e22ee70bfc6fd7b62037ecff19758080dc88ceee94714e0ade9d850feb897c57 +size 4321 diff --git a/quota.changes b/quota.changes index 1202ee7..3b874b4 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 17 12:52:33 UTC 2011 - vcizek@novell.com + +- moved port settings to sysconfig/nfs (bnc#637382) + ------------------------------------------------------------------- Thu Sep 9 16:59:51 CEST 2010 - anicka@suse.cz From d82580c214d2f7359cf71cb37d997de6f02a1cea26bd01540cef4c6f267c517c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Fri, 18 Feb 2011 09:52:23 +0000 Subject: [PATCH 5/7] fixed parameters for fillup_and_insserv macro OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=11 --- quota.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/quota.spec b/quota.spec index 500c848..5e614bf 100644 --- a/quota.spec +++ b/quota.spec @@ -120,8 +120,7 @@ rm -rf $RPM_BUILD_ROOT %{fillup_and_insserv -f -y boot.quota} %post nfs -%{fillup_and_insserv -an nfs quotad} -#%{fillup_only -an nfs} +%{fillup_and_insserv -f -n nfs quotad} %preun %stop_on_removal boot.quota From d44676146271d296e6f9822ad78cfbaf802d6586573de9e16048847567853d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Fri, 18 Feb 2011 10:39:43 +0000 Subject: [PATCH 6/7] the service doesn't start after installation, as the documentation says OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=12 --- quota.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quota.spec b/quota.spec index 5e614bf..ff41464 100644 --- a/quota.spec +++ b/quota.spec @@ -120,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT %{fillup_and_insserv -f -y boot.quota} %post nfs -%{fillup_and_insserv -f -n nfs quotad} +%{fillup_only -an nfs} %preun %stop_on_removal boot.quota From 0d7ac416f342293dc63e1ff11d394da2ac53109fb360fe66c46f0857ef563d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Fri, 18 Feb 2011 10:48:31 +0000 Subject: [PATCH 7/7] update of .changes OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=13 --- quota.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/quota.changes b/quota.changes index 3b874b4..f44b85f 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 18 10:46:04 UTC 2011 - vcizek@novell.com + +- disabled autostart of quota-nfs service after installation, + as stated in documentation + ------------------------------------------------------------------- Thu Feb 17 12:52:33 UTC 2011 - vcizek@novell.com