Date: Monday, June 1, 2015 @ 09:56:06 Author: seblu Revision: 239985 upgpkg: quagga 0.99.24.1-2
- move to systemd-sysusers and systemd-tmpfiles Added: quagga/trunk/quagga.sysusers quagga/trunk/quagga.tmpfiles Modified: quagga/trunk/PKGBUILD quagga/trunk/quagga.install -----------------+ PKGBUILD | 11 ++++++++--- quagga.install | 25 ++++++------------------- quagga.sysusers | 1 + quagga.tmpfiles | 3 +++ 4 files changed, 18 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-01 07:34:58 UTC (rev 239984) +++ PKGBUILD 2015-06-01 07:56:06 UTC (rev 239985) @@ -3,7 +3,7 @@ pkgname=quagga pkgver=0.99.24.1 -pkgrel=1 +pkgrel=2 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -12,6 +12,8 @@ options=('!buildflags') install=quagga.install source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" + 'quagga.sysusers' + 'quagga.tmpfiles' 'babeld.service' 'bgpd.service' 'isisd.service' @@ -21,6 +23,8 @@ 'ripngd.service' 'zebra.service') md5sums=('7986bdc2fe6027d4c9216f7f5791e718' + '286c545efadcc7b463eb603c25473cb4' + '9dfa2f649a2c83a2e52f5f89dec3b167' '20a8e36ad851d4e06467aeb56a84b245' 'cc90c234aac9098c5132d653037d5269' '67d0ada0f3000b9a86351798786c5256' @@ -76,11 +80,12 @@ # systemd cd "$srcdir" + install -d -m 755 "$pkgdir"/usr/lib/{systemd/system,tmpfiles.d,sysusers.d} for _d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do install -D -m 644 $_d.service "$pkgdir/usr/lib/systemd/system/$_d.service" done - install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" - echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + install -D -m 644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + install -D -m 644 $pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" } # vim:set ts=2 sw=2 et: Modified: quagga.install =================================================================== --- quagga.install 2015-06-01 07:34:58 UTC (rev 239984) +++ quagga.install 2015-06-01 07:56:06 UTC (rev 239985) @@ -2,35 +2,22 @@ filelist=(quagga.info quagga.info-1 quagga.info-2) post_install() { - groupadd -r quagga - useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null - install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga + systemd-sysusers quagga.conf + systemd-tmpfiles --create quagga.conf post_upgrade } post_upgrade() { if [[ -x /usr/bin/install-info ]]; then - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + for file in "${filelist[@]}"; do + install-info "$infodir/$file.gz" "$infodir/dir" 2>/dev/null done fi + : } pre_remove() { - for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do - /etc/rc.d/$d stop &>/dev/null - done - if [[ -x /usr/bin/install-info ]]; then - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done - fi + post_upgrade } -post_remove() { - userdel quagga &>/dev/null - groupdel quagga &>/dev/null - rmdir /{etc,var/log}/quagga -} - # vim: ft=sh ts=2 sw=2 et: Added: quagga.sysusers =================================================================== --- quagga.sysusers (rev 0) +++ quagga.sysusers 2015-06-01 07:56:06 UTC (rev 239985) @@ -0,0 +1 @@ +u quagga - - /run/quagga Added: quagga.tmpfiles =================================================================== --- quagga.tmpfiles (rev 0) +++ quagga.tmpfiles 2015-06-01 07:56:06 UTC (rev 239985) @@ -0,0 +1,3 @@ +d /etc/quagga 0750 quagga quagga +d /var/log/quagga 0750 quagga quagga +d /run/quagga 0750 quagga quagga