diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2016-02-08 18:30:43 +0000 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2016-02-08 18:30:43 +0000 |
| commit | 3257afd801bc7b5881f494a916dd6c7da25ef259 (patch) | |
| tree | 0a7c5540744cb582b2f7b7d86ecf969457bd859f /sys-fs | |
| parent | Update sys-apps/iproute2-4.3.0 (diff) | |
| download | srcshelton-3257afd801bc7b5881f494a916dd6c7da25ef259.tar.gz srcshelton-3257afd801bc7b5881f494a916dd6c7da25ef259.tar.bz2 srcshelton-3257afd801bc7b5881f494a916dd6c7da25ef259.zip | |
Update x11-drivers/nvidia-drivers-340.96
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/lvm2/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1 | 22 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 0a11bc3c..6fbc5813 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -51,7 +51,7 @@ AUX lvm2-start.sh 1025 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c AUX lvm2-start.sh-2.02.49-r3 1244 SHA256 e9c72d8500294301131183b37a7060dbcbd1d01b2a3e8425cf644e07652fae87 SHA512 5e57db4f24584437262f76d1c7ea8753decca8c4b041ec2e0414d92a81ea04cff48fee48fa01b7a0d7d9bc97493cee32ce78da6348f3920704be64f9671bb5ec WHIRLPOOL d90452503560ff6e97235c34f2bba7cca96905a4f881cd3fd7aa47c5a191b2529596c944c95aa8d7472ef5d2d7ad4a21432ac702ce1094697d42219a20d671a7 AUX lvm2-start.sh-2.02.67-r1 1267 SHA256 48def1f022a337df7cd030c0d1e386d843026814da5494dde5610aa66af94bd2 SHA512 0b60d5be19673927872b310b6825c5912dea55028b05668914856cb085fcf229fffc0089479b1e5bf346cc9e6f1c7f024634cafca5ebfbd0f431264455ddc4f4 WHIRLPOOL 59db10f46e56ef19824b0c43a92790a29a108648138137dfe40c3fa9673d2df3087d8852bae4843dbdc04db393d12fc318a7db186ce2e5ab039dde288c259516 AUX lvm2-start.sh-2.02.95 1535 SHA256 46225f0703ac66b8a41b34c74a93060749386be1e8c13e74ec2785cdd38577b4 SHA512 7ab702a6d62e608e2427561338aa04257303ef13ba79ba90810925723512523cba66d14751b1585fdf47cdde9897143a2f3868992095bfa5fb3b7cd013383ba4 WHIRLPOOL 97626e6ae3a22daae3ee15f7bc854d012776a73b6971d1ed6ae184ea2a5c3a1106c759a752a128cc7592ec3cf3620487e75796e4e0041ed8bf6574eeda501a9c -AUX lvm2-start.sh-2.02.97-r1 1555 SHA256 98adb6bd0dafbd04c6af0614e801794dd71e5975270ad7717176e0e2b5827b17 SHA512 7088d74666a3c021f96a62fef90feed482148f53ec6d7b8b7bd368ac29785687df50235554b80352731ee926255e1b82b50739ea43e58d9aa9cb626d631102de WHIRLPOOL f86c7bd8e8380f8fa7c052f11261c6a3e1d9c5b5bdae212c959fb32d92ca734cb368e0cbac81a5a11e58b8d0e0b84a6c6b19a120a9c3ee6a98ff04267a59314a +AUX lvm2-start.sh-2.02.97-r1 1323 SHA256 8ff9d5e1cd7e9650a2fb8efab060c76781f13e1438ddefc7875d5b95ea2440e7 SHA512 4f660d492774283b67a9fa82c0dc2c6afaca113eddf51039856f9943e79c68313414ff4251d3c0536d97a8daa80d0b7a2fcc3629fe26fad63b9fd6fe6a046596 WHIRLPOOL caac228e9ea3302d78924bee97c53fa9d3c44de17017cf1866ebca4be8c9d3abffde8aa4d0c07040c306b385f217919a97eac8a5a5a27de5974f9893aa03e8a5 AUX lvm2-stop.sh 1939 SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c SHA512 f372d458b5bccbf872f7a8cc6759bde1c6aea90ba28b0a8a40b05084339e2bebf2d26431de8862cbb072e0b1e9970f393ac82fcda9437adfc75127ca2c76f97a WHIRLPOOL 74bd413264d8c6342b74d363ff1154e4c56b44526151869619f14d3c9952e2b870673676ad23a11ea9fa2ae0034c677897a3d859ea58b269411703d3fc0ebf10 AUX lvm2-stop.sh-2.02.49-r3 2253 SHA256 dea23f37d232437b15c743ca23af3d7baa95f2b7c71ac1e47ae5289bdcfe0a56 SHA512 909eae8d09157a7227c4240bb9d0a3d2a56347b8926a2209b3d778d6c4f709c94fec8d966839ea8ac4fcb0f2fed8ae4349bcb6b9d487ec83116b83123fff7979 WHIRLPOOL 057ea018b83f8480407cbbbc0b60ed17dcb84644476382f8a79dec9f08caea6f5a103d21389a12697927b205f91b3168db5db65596c5e86cd130482b78d6d489 AUX lvm2-stop.sh-2.02.67-r1 982 SHA256 7a793715d1b157801fd503f39740a82131bc5b53bb57c845f6a01f960d769bce SHA512 280da1c5ff91d660f1eda3920c9068dfbfe8e180ad8a9a0c3e05368b2531f2f2efa8bc2e405ad315c012ca4015f6080c45dac434aa8355ec783f1745e190667c WHIRLPOOL 380aee9ac828be5f9df7ef0704945554365e695c0f6bb17dfc6f6feb9ecee7c143fbac71a054341945f5f8cced982450d8d670ec9c2dfce8652a23d33cfc7c7e diff --git a/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1 b/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1 index f09e78f3..b36192bc 100644 --- a/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1 +++ b/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1 @@ -1,7 +1,7 @@ # /lib/rcscripts/addons/lvm-start.sh # $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh-2.02.95,v 1.1 2012/03/27 03:20:56 robbat2 Exp $ -config='global { locking_dir = "/dev/.lvm" }' +config='global { locking_type = 1 locking_dir = "/dev/.lvm" }' dm_in_proc() { local retval=0 @@ -30,18 +30,14 @@ if [ -z "${CDBOOT}" ] ; then modprobe dm-mod 2>/dev/null fi if [ -d /proc/lvm ] || dm_in_proc ; then - ebegin "Setting up the Logical Volume Manager" - #still echo stderr for debugging - lvm_commands="#! ${lvm_path} --config '${config}'\n" - # Extra PV find pass because some devices might not have been available until very recently - lvm_commands="${lvm_commands}pvscan\n" - # Now make the nodes - lvm_commands="${lvm_commands}vgscan --mknodes\n" - # And turn them on! - lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" - # Order of this is important, have to work around dash and LVM readline - printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null - eend $? "Failed to setup the LVM" + ebegin "Setting up Logical Volume Manager" + + # For debug purposes, don't redirect stderr... + $lvm_path pvscan --ignorelockingfailure --config "${config}" >/dev/null && + $lvm_path vgscan --mknodes --ignorelockingfailure --config "${config}" >/dev/null && + $lvm_path vgchange --sysinit -a ly --ignorelockingfailure --config "${config}" >/dev/null + + eend $? "Failed to setup LVM" fi fi |