Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=00abcd242a8b887b12e4a07a7b34826ccf2af2dd
commit 00abcd242a8b887b12e4a07a7b34826ccf2af2dd Author: Miklos Vajna <[email protected]> Date: Mon Aug 22 10:48:32 2011 +0200 lvm2-2.02.88-1-i686 - version bump - remove no longer needed sysv script diff --git a/source/apps/lvm2/FrugalBuild b/source/apps/lvm2/FrugalBuild index ff6fd19..9a4c84d 100644 --- a/source/apps/lvm2/FrugalBuild +++ b/source/apps/lvm2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=lvm2 -pkgver=2.02.86 -pkgrel=2 +pkgver=2.02.88 +pkgrel=1 pkgdesc="Logical Volume Manager 2 utilities" url="http://sources.redhat.com/lvm2/" depends=('udev') @@ -12,8 +12,8 @@ backup=(etc/lvm/lvm.conf) groups=('apps') archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump ftp://sources.redhat.com/pub/lvm2/|grep tgz$|sed -n 's/.*LVM2\.\(.*\)\.tgz/\1/;$ p'" -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$pkgver.tgz rc.lvm lvm.service README.Frugalware) -signatures=($source.asc '' '' '') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$pkgver.tgz lvm.service README.Frugalware) +signatures=($source.asc '' '') build() { @@ -24,7 +24,6 @@ build() make DESTDIR=$Fdestdir sbindir="$Fdestdir/sbin" \ confdir="$Fdestdir/etc/lvm" libdir="$Fdestdir/lib" \ install install_device-mapper - Frcd2 lvm Ffile /lib/systemd/system/lvm.service Fmkdir /etc/systemd/system/sysinit.target.wants Fdoc README.Frugalware diff --git a/source/apps/lvm2/lvm2.install b/source/apps/lvm2/lvm2.install index c135576..7e1890f 100644 --- a/source/apps/lvm2/lvm2.install +++ b/source/apps/lvm2/lvm2.install @@ -1,24 +1,17 @@ post_install() { - cd /etc/rc.d/rcS.d - ln -sf ../rc.lvm S14rc.lvm - chkconfig --add rc.lvm systemctl enable lvm.service >/dev/null 2>&1 } post_upgrade() { + # can be removed once Frugalware-1.6 is out + rm -f /etc/rc.d/rcS.d/S14rc.lvm systemctl daemon-reload >/dev/null 2>&1 - # special case: rc.lvm is enabled in rcS.d only - if [ `vercmp $2 2.02.81-2` -lt 0 -a -e /etc/rc.d/rcS.d/S14rc.lvm ] ; then - post_install - fi } pre_remove() { - rm /etc/rc.d/rcS.d/S14rc.lvm - chkconfig --del rc.lvm systemctl disable lvm.service >/dev/null 2>&1 systemctl stop lvm.service >/dev/null 2>&1 } diff --git a/source/apps/lvm2/rc.lvm b/source/apps/lvm2/rc.lvm deleted file mode 100644 index 46b1814..0000000 --- a/source/apps/lvm2/rc.lvm +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Default-Start: S -### END INIT INFO - -# (c) 2003, 2009 Vajna Miklos <[email protected]> -# (c) Patrick J. Volkerding, <[email protected]> -# rc.lvm for Frugalware -# distributed under GPL License - -# chkconfig: - 00 98 -# description: Logical Volume manager - -source /lib/initscripts/functions -TEXTDOMAIN=lvm - -actions=(restart start stop status) -daemon=$"volume groups" - -pid="test -f /var/lock/subsys/lvm && echo running" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - if [ -e /proc/modules ] && \ - ! grep -qs 'device-mapper' /proc/{devices,misc}; then - modprobe dm-mod - fi - if [ -d /proc/lvm ] || \ - grep -qs 'device-mapper' /proc/{devices,misc} ; then - /sbin/vgscan --mknodes --ignorelockingfailure &>/dev/null - if [ $? == 0 ] && [ -f /etc/lvmtab -o -d /etc/lvm ]; then - /sbin/vgchange --ignorelockingfailure -a y &>/dev/null - fi - fi - [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys - touch /var/lock/subsys/lvm - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - if [ "$2" != 0 -a "$2" != 6 ]; then - return - fi - stop_msg - if [ -n "$(eval $pid)" ]; then - # logical volumes - for i in `lvdisplay 2>&1|grep "LV Name"|sed -e 's/.*LV Name\s*\(.*\)/\1/'|sort` - do - # is it active? - if [ `lvdisplay $i|grep "# open"|awk '{print $3}'` = 0 ]; then - lvchange -an --ignorelockingfailure -P $i >/dev/null - fi - done - # volume groups - for i in `vgdisplay 2>&1|grep "VG Name"|sed -e 's/.*VG Name\s*\(.*\)/\1/'|sort` - do - # has the volume group an active logical volume? - if [ `vgdisplay $i|grep "Open LV"|sed -e 's/.*Open LV\s*\(.*\)/\1/'`]; then - vgchange -an --ignorelockingfailure -P $i \ - >/dev/null - fi - done - ok $? - # sleep 1 fixes problems with some hard drives that don't - # otherwise finish syncing before reboot or poweroff - sleep 1 - # this is to ensure all processes have completed on SMP machines - wait - rm -f /var/lock/subsys/lvm - else - ok 999 - fi -} - -rc_exec $1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
