Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a4728b414c6a8bdb269af19cfff73f54ce2917d

commit 9a4728b414c6a8bdb269af19cfff73f54ce2917d
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sun Dec 19 01:40:58 2010 +0100

quota-tools-3.17-3-i686

- move tools needed for rc script from /usr/sbin to /sbin
- disable rc script when using systemd and enable native units instead

diff --git a/source/apps/quota-tools/FrugalBuild 
b/source/apps/quota-tools/FrugalBuild
index ad0175e..0e3d878 100644
--- a/source/apps/quota-tools/FrugalBuild
+++ b/source/apps/quota-tools/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=quota-tools
pkgver=3.17
-pkgrel=2
+pkgrel=3
pkgdesc="Linux disk quota utilities"
depends=('e2fsprogs')
groups=('apps')
@@ -16,7 +16,7 @@ Finclude sourceforge
url="http://sourceforge.net/projects/linuxquota/";
source=($source rc.quota README.Frugalware)
sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762' \
-          '7411165c7a5c63b3685bc3d9e8f2c77c4fdd195e' \
+          'd4dd7a1b2d41e156145dfbb32318211f913471dc' \
'5c16336dce569446d9df7ce7a70c951f2b9a2af4')

build()
@@ -24,12 +24,16 @@ build()
Fcd $pkgname
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 925368c..663470b 100644
--- a/source/apps/quota-tools/quota-tools.install
+++ b/source/apps/quota-tools/quota-tools.install
@@ -1,10 +1,14 @@
post_install()
{
/usr/sbin/chkconfig --add rc.quota
+       ln -sf '/lib/systemd/system/quotacheck.service' 
'/etc/systemd/system/local-fs.target.wants/quotacheck.service'
+       ln -sf '/lib/systemd/system/quotaon.service' 
'/etc/systemd/system/local-fs.target.wants/quotaon.service'
}

pre_remove()
{
+       rm -f '/etc/systemd/system/local-fs.target.wants/quotacheck.service'
+       rm -f '/etc/systemd/system/local-fs.target.wants/quotaon.service'
/usr/sbin/chkconfig --del rc.quota
}

diff --git a/source/apps/quota-tools/rc.quota b/source/apps/quota-tools/rc.quota
index 62ec266..dc6a086 100644
--- a/source/apps/quota-tools/rc.quota
+++ b/source/apps/quota-tools/rc.quota
@@ -15,9 +15,9 @@ actions=(start stop status)
daemon=$"quota service"

# names of binaries
-check=/usr/sbin/quotacheck
-on=/usr/sbin/quotaon
-off=/usr/sbin/quotaoff
+check=/sbin/quotacheck
+on=/sbin/quotaon
+off=/sbin/quotaoff
quotaisoff=/var/lib/quota/off
quotaisnew=/var/lib/quota/new
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to