diff options
| author | David Zeuthen <david@fubar.dk> | 2006-02-24 04:31:04 +0000 |
|---|---|---|
| committer | David Zeuthen <david@fubar.dk> | 2006-02-24 04:31:04 +0000 |
| commit | 71a1222a7b3f086727c07f44b3dffa904120d72d (patch) | |
| tree | fd83de56bdce7413669812259bf3d55202d034c0 | |
| parent | 6f6be51ff03d2a047cc672f3b8705223fd0304f8 (diff) | |
Actually remove this file
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tools/hal-luks-setup.in | 55 |
2 files changed, 4 insertions, 55 deletions
@@ -1,5 +1,9 @@ 2006-02-23 David Zeuthen <davidz@redhat.com> + * tools/hal-luks-setup.in: Actually remove this file + +2006-02-23 David Zeuthen <davidz@redhat.com> + * hald/linux2/blockdev.c (hotplug_event_begin_add_blockdev): Add some useful debugging on errors diff --git a/tools/hal-luks-setup.in b/tools/hal-luks-setup.in deleted file mode 100755 index 88f7c7cd..00000000 --- a/tools/hal-luks-setup.in +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# FILE: hal-luks-setup -- HAL method wrapper for luks-setup -# AUTHOR: W. Michael Petullo <mike@flyn.org> -# DATE: 13 July 2005 -# -# Copyright (C) 2005 W. Michael Petullo <mike@flyn.org> -# All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Check for environment variables -if [ "$HAL_PROP_BLOCK_DEVICE" == "" ] || [ "$HAL_PROP_INFO_UDI" == "" ] ; then - echo "Missing or empty environment variable(s)." >&2 - echo "This script should be started by hald." >&2 - exit 1 -fi - - -read password - -LUKSSETUP=@SBINDIR@/luks-setup -HALSETPROPERTY=@BINDIR@/hal-set-property - -if [ ! -f $LUKSSETUP ]; then - echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2 - echo Error setting up $HAL_PROP_BLOCK_DEVICE - $LUKSSETUP not found >&2 - exit 1 -fi - -if ! echo $password | $LUKSSETUP $HAL_PROP_BLOCK_DEVICE 2> /dev/null; then - echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2 - echo Error setting up $HAL_PROP_BLOCK_DEVICE - bad password? >&2 - exit 1 -fi - -if ! $HALSETPROPERTY --udi="$HAL_PROP_INFO_UDI" --key="info.callouts.remove" --strlist-pre="hal-luks-remove" 2> /dev/null; then - echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2 - echo Error setting info.callouts.remove >&2 - exit 1 -fi - -exit 0 |