diff options
| author | Cecil <knoppmyth@gmail.com> | 2011-08-06 19:10:30 (GMT) |
|---|---|---|
| committer | Cecil <knoppmyth@gmail.com> | 2011-08-06 19:10:30 (GMT) |
| commit | ad58e3033f6bb5137b8dcb0e7eca12d50d888402 (patch) | |
| tree | 9321335a68173bc3e4c1d237c19c8880411fa676 /abs/core/lvm2/lvm2_hook | |
| parent | 998faf16b1b62493b39aa13b3cb53dfac266ef4c (diff) | |
| parent | 9709ca528ca5dfbdb6ec6ea283ac6670e8f33b9d (diff) | |
| download | linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.zip linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.tar.gz linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.tar.bz2 | |
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Conflicts:
abs/core/tzdata/PKGBUILD
Diffstat (limited to 'abs/core/lvm2/lvm2_hook')
| -rw-r--r-- | abs/core/lvm2/lvm2_hook | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/abs/core/lvm2/lvm2_hook b/abs/core/lvm2/lvm2_hook index 13183c6..874b91d 100644 --- a/abs/core/lvm2/lvm2_hook +++ b/abs/core/lvm2/lvm2_hook @@ -4,7 +4,8 @@ run_hook () /sbin/modprobe -q dm-mod >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi # If the lvmwait= parameter has been specified on the command line @@ -17,9 +18,8 @@ run_hook () [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - msg "Scanning logical volumes..." - eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET msg "Activating logical volumes..." - eval /sbin/lvm vgchange --ignorelockingfailure --ignoremonitoring -ay $LVMQUIET + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET fi } |