diff options
| author | maximilian attems <maks@debian.org> | 2006-07-02 18:57:07 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2006-07-02 18:57:07 +0200 |
| commit | 0d341b8d32810844ce035e89a9e60fb7a7dde4b6 (patch) | |
| tree | 55a7b2d2fe9e9cde049c1e7962b3baef00107c5b /scripts/local-top/lvm | |
| parent | 09276c4c9f7deb9a46cf162747b5749f94738c2b (diff) | |
| download | initramfs-tools-0d341b8d32810844ce035e89a9e60fb7a7dde4b6.tar.gz initramfs-tools-0d341b8d32810844ce035e89a9e60fb7a7dde4b6.zip | |
woow pile of stuff turned up:
- cleanup of activate_vg() in lvm boot script
- use less of busybox utilities
- conf.d for BUSYBOX=y usage for the packages
- don't poke on conffile for RESUME
- use printf instead of expr (ooh ash and dash are *fun*)
- fix update-initramfs to use current_version when no other
version exists around
Diffstat (limited to 'scripts/local-top/lvm')
| -rwxr-xr-x | scripts/local-top/lvm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/local-top/lvm b/scripts/local-top/lvm index fc1036e..5323a7d 100755 --- a/scripts/local-top/lvm +++ b/scripts/local-top/lvm @@ -21,7 +21,7 @@ activate_vg() # Make sure that we have a non-empty argument if [ -z "${vg}" ]; then - return 0 + return 1 fi # Take care of lilo boot arg, risky activating of all vg @@ -40,7 +40,12 @@ activate_vg() # Make sure that we have a d-m path vg=${vg#/dev/mapper/} if [ "$vg" = "$1" ]; then - return 0 + return 1 + fi + + # Make sure that the device includes at least one dash + if [ "$(echo -n "$vg" | tr -d -)" = "$vg" ]; then + return 1 fi # Split volume group from logical volume. @@ -61,3 +66,5 @@ modprobe -q dm-mirror activate_vg "$ROOT" activate_vg "$resume" + +exit 0 |