Date: Saturday, November 3, 2012 @ 14:33:00 Author: thomas Revision: 170157
upgpkg: lvm2 2.02.98-3: small fix to lvmetad.socket and move everything to /usr Modified: lvm2/trunk/PKGBUILD lvm2/trunk/dmeventd.service lvm2/trunk/lvm-monitoring.service lvm2/trunk/lvm2_install lvm2/trunk/lvmetad.service lvm2/trunk/lvmetad.socket ------------------------+ PKGBUILD | 15 +++++++-------- dmeventd.service | 4 ++-- lvm-monitoring.service | 6 +++--- lvm2_install | 6 +++--- lvmetad.service | 4 ++-- lvmetad.socket | 2 +- 6 files changed, 18 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-11-03 18:29:36 UTC (rev 170156) +++ PKGBUILD 2012-11-03 18:33:00 UTC (rev 170157) @@ -5,7 +5,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.98 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -22,22 +22,21 @@ lvmetad.socket) sha1sums=('077425115b164c335a9930df745943e9ea666a8a' '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8' - '2960759b411e93fb2377b6a259eb71d426b51dd9' + '8008547b133af89f79461a6df5412539ed3f26b7' 'ff0fdf0a3005a41acd4b36865056109effc3474b' 'f6a554eea9557c3c236df2943bb6e7e723945c41' 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4' - '7c3e1ce29ac80698c1b558ac3a2848da84ea7d8d' + 'cbc64f377fbb1c1a9ff53bc6ca85c324075499b7' '1d56f47a81350ae37ffbf61ee036fe31f4c5d504' - '2fa406422a99cc3adcdfe6d59f4836fd0e55b17f' - 'c6073a48495376a33ee0ace5c3c9c32a5f559ddf' - '370f497c28754169e427c8419bceb73f1cf64757') + 'ae945cae2d71b286439a9945876acb78dc9eeaf7' + '460b094e8689298ed59842d1abcee5d4e706e1d7' + 'fcfc265e3b10294cc4b10949a342e9db4310b186') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-udev-prefix=/usr \ --with-systemdsystemunitdir=/usr/lib/systemd/system --with-default-pid-dir=/run \ --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ Modified: dmeventd.service =================================================================== --- dmeventd.service 2012-11-03 18:29:36 UTC (rev 170156) +++ dmeventd.service 2012-11-03 18:33:00 UTC (rev 170157) @@ -7,8 +7,8 @@ [Service] Type=forking -ExecStart=/sbin/dmeventd -ExecReload=/sbin/dmeventd -R +ExecStart=/usr/sbin/dmeventd +ExecReload=/usr/sbin/dmeventd -R Environment=SD_ACTIVATION=1 PIDFile=/run/dmeventd.pid OOMScoreAdjust=-1000 Modified: lvm-monitoring.service =================================================================== --- lvm-monitoring.service 2012-11-03 18:29:36 UTC (rev 170156) +++ lvm-monitoring.service 2012-11-03 18:33:00 UTC (rev 170157) @@ -10,9 +10,9 @@ [Service] Type=oneshot Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 -ExecStart=/sbin/lvm vgchange --monitor y -ExecStop=/sbin/lvm vgchange --monitor n +ExecStart=/usr/sbin/lvm vgchange --monitor y +ExecStop=/usr/sbin/lvm vgchange --monitor n RemainAfterExit=yes [Install] -WantedBy=sysinit.target \ No newline at end of file +WantedBy=sysinit.target Modified: lvm2_install =================================================================== --- lvm2_install 2012-11-03 18:29:36 UTC (rev 170156) +++ lvm2_install 2012-11-03 18:33:00 UTC (rev 170157) @@ -6,9 +6,9 @@ add_module "$mod" done - add_binary "/sbin/lvm" - add_binary "/sbin/lvmetad" - add_binary "/sbin/dmsetup" + add_binary "/usr/sbin/lvm" + add_binary "/usr/sbin/lvmetad" + add_binary "/usr/sbin/dmsetup" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" Modified: lvmetad.service =================================================================== --- lvmetad.service 2012-11-03 18:29:36 UTC (rev 170156) +++ lvmetad.service 2012-11-03 18:33:00 UTC (rev 170157) @@ -9,8 +9,8 @@ [Service] Type=forking NonBlocking=true -ExecStart=/sbin/lvmetad -ExecReload=/sbin/lvmetad -R +ExecStart=/usr/sbin/lvmetad +ExecReload=/usr/sbin/lvmetad -R Environment=SD_ACTIVATION=1 Restart=on-abort PIDFile=/run/lvmetad.pid Modified: lvmetad.socket =================================================================== --- lvmetad.socket 2012-11-03 18:29:36 UTC (rev 170156) +++ lvmetad.socket 2012-11-03 18:33:00 UTC (rev 170157) @@ -1,7 +1,7 @@ [Unit] Description=LVM2 metadata daemon socket Documentation=man:lvmetad(8) -Before=sockets.target +Before=sockets.target systemd-udev-trigger.service DefaultDependencies=no Conflicts=shutdown.target