Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=edbf9cab59df367359b381534ab8350b8e98aa9c
commit edbf9cab59df367359b381534ab8350b8e98aa9c Author: Miklos Vajna <[email protected]> Date: Sat Sep 10 22:38:14 2011 +0200 quota-tools-3.17-5-i686 - drop sysv script, quota services are now pulled in by mount points, hence no need to enable them explicitly diff --git a/source/apps/quota-tools/FrugalBuild b/source/apps/quota-tools/FrugalBuild index 40a5c1a..15e9cbd 100644 --- a/source/apps/quota-tools/FrugalBuild +++ b/source/apps/quota-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=quota-tools pkgver=3.17 -pkgrel=4 +pkgrel=5 pkgdesc="Linux disk quota utilities" depends=('e2fsprogs') rodepends=('systemd') @@ -15,9 +15,8 @@ _F_sourceforge_name=quota _F_archive_grepv="pre" Finclude sourceforge url="http://sourceforge.net/projects/linuxquota/"; -source=($source rc.quota README.Frugalware) +source=($source README.Frugalware) sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762' \ - 'd4dd7a1b2d41e156145dfbb32318211f913471dc' \ '5c16336dce569446d9df7ce7a70c951f2b9a2af4') build() @@ -26,15 +25,11 @@ build() Fmake --sysconfdir=/etc || return 1 make ROOTDIR=$Fdestdir install || return 1 Fmv /usr/sbin /sbin - Frcd2 quota # remove conflicts: glibc and nfs-utils Frm /usr/include/rpcsvc/rquota.{h,x} Frm /usr/share/man/man{2/quotactl.2,8/rquotad.8} Fdoc README.Frugalware Fmkdir /var/lib/quota - - # don't run old sysv init script with different name when using systemd - Fln quotaon.service /lib/systemd/system/quota.service } # optimization OK diff --git a/source/apps/quota-tools/quota-tools.install b/source/apps/quota-tools/quota-tools.install index ff5e4d8..6c6273b 100644 --- a/source/apps/quota-tools/quota-tools.install +++ b/source/apps/quota-tools/quota-tools.install @@ -1,13 +1,7 @@ -post_install() +post_upgrade() { - /usr/sbin/chkconfig --add rc.quota - systemctl enable quotacheck.service quotaon.service >/dev/null 2>&1 -} - -pre_remove() -{ - systemctl disable quotacheck.service quotaon.service >/dev/null 2>&1 - /usr/sbin/chkconfig --del rc.quota + # can be removed after Frugalware-1.6 + rm -f /etc/rc.d/rc?.d/???rc.quota } op=$1 diff --git a/source/apps/quota-tools/rc.quota b/source/apps/quota-tools/rc.quota deleted file mode 100644 index dc6a086..0000000 --- a/source/apps/quota-tools/rc.quota +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -# (c) 2007 CSÉCSY László <[email protected]> -# rc.quota for Frugalware -# distributed under GPL License - -# chkconfig: 345 55 60 -# description: Check quotas and then turn quota system on/off - -source /lib/initscripts/functions -TEXTDOMAIN=quota -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop status) -daemon=$"quota service" - -# names of binaries -check=/sbin/quotacheck -on=/sbin/quotaon -off=/sbin/quotaoff -quotaisoff=/var/lib/quota/off -quotaisnew=/var/lib/quota/new - -ALLFLAGS=-aug #hint: --all --user --group -CHECKFLAGS=${ALLFLAGS}m #hint: --no-remount -USERFLAGS=-uc #hint: --create-files -GROUPFLAGS=-gc #hint: --create-files - -# create list of all fs with quota -scan_fstab() -{ - tmplist=`grep "^[ ]*[^#].*$1" /etc/fstab | \ - sed -e 's/\(^[[:space:]]*[^[:space:]]*[[:space:]]*[^[:space:]]*[[:space:]]*[^[:space:]]*\).*/\1/g' \ - -e 's/^[[:space:]]*[^[:space:]]*[[:space:]]*//g'` - list=${tmplist:=empty} -} - - -rc_start() -{ - start_msg - # Check if quota already has been enabled - if ! quotaon -ap|grep -q "is off"; then #hint: --all --print-state - ok 999 - exit 0 - fi - ok 0 - - # Check all filesystems if quota is new or wasn't shut down correctly - msg $"Checking quotas..." - if [ -x $check ] && ( [ ! -f $quotaisoff ] || [ -f $quotaisnew ] ); then - $check $CHECKFLAGS || $check -c $CHECKFLAGS #hint: --create-files - check_ok=997 - else - check_ok=0 - # if some filesystems are new check just these filesystems - scan_fstab "usrquota" - set -- $list - - while [ $# -ge 2 ] - do - if [ "$2" != "xfs" ] - then - if test ! -e $1/quota.user && test ! -e $1/aquota.user; then - ok 1 - msg $"Warning: user quota not configured in filesystem" "\`$1.'" - check_ok=999 - elif test ! -e $1/aquota.user; then - test ! -s $1/quota.user && $check $USERFLAGS $1 - check_ok=$? - elif test ! -s $1/aquota.user; then - $check $USERFLAGS $1 - check_ok=$? - fi - fi - shift; shift - done - - scan_fstab "grpquota" - set $list - - while [ $# -ge 2 ] - do - if [ "$2" != "xfs" ] - then - if test ! -e $1/quota.group && test ! -e $1/aquota.group; then - ok 1 - msg $"Warning: group quota not configured in filesystem" "\`$1.'" - check_ok=999 - elif test ! -e $1/aquota.group; then - test ! -s $1/quota.group && $check $GROUPFLAGS $1 - check_ok=$? - elif test ! -s $1/aquota.group; then - $check $GROUPFLAGS $1 - check_ok=$? - fi - fi - shift; shift - done - fi - ok $check_ok - - # Remove quota-off and quota-new files - rm -f $quotaisoff $quotaisnew - - # Turn quotas on. - if [ -x $on ] - then - msg $"Turning on quotas" - $on $ALLFLAGS - fi - ok $? -} - -rc_stop() -{ - stop_msg $"Turning off quotas" - if [ -x $off ] - then - $off $ALLFLAGS || true - # Create quota-on file - touch $quotaisoff - fi - ok $? -} - -rc_exec $1
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
