diff options
| author | David Zeuthen <david@fubar.dk> | 2006-02-13 07:49:18 +0000 |
|---|---|---|
| committer | David Zeuthen <david@fubar.dk> | 2006-02-13 07:49:18 +0000 |
| commit | f8f7cb58eab3350e4221b741add68ff58749398c (patch) | |
| tree | 4aca1276a48fd06afc205b6a7578d67db839f551 | |
| parent | f08318dddcf5fd88ac806ce5db54895709314ab8 (diff) | |
Refuse to setup the device if it's already setup once
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | tools/hal-luks-setup | 6 |
2 files changed, 11 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2006-02-13 David Zeuthen <davidz@redhat.com> + * tools/hal-luks-setup: Refuse to setup the device if it's already + setup once + +2006-02-13 David Zeuthen <davidz@redhat.com> + * configure.in: Don't generate tools/hal-luks-remove.in, tools/hal-luks-setup.in diff --git a/tools/hal-luks-setup b/tools/hal-luks-setup index efdad254..a52f7e66 100755 --- a/tools/hal-luks-setup +++ b/tools/hal-luks-setup @@ -23,6 +23,12 @@ if [ ! -f $CRYPTSETUP ]; then exit 1 fi +if [ -e /dev/mapper/luks_crypto_$HAL_PROP_VOLUME_UUID ]; then + echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2 + echo $HAL_PROP_BLOCK_DEVICE is already setup? >&2 + exit 1 +fi + if ! echo $password | $CRYPTSETUP luksOpen $HAL_PROP_BLOCK_DEVICE luks_crypto_$HAL_PROP_VOLUME_UUID 2> /dev/null; then echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2 echo Error setting up $HAL_PROP_BLOCK_DEVICE - bad password? >&2 |