hal/tools Makefile.am,1.16,1.17 hal-luks-setup.in,NONE,1.1

David Zeuthen david at freedesktop.org
Wed Jul 20 16:43:21 PDT 2005


Update of /cvs/hal/hal/tools
In directory gabe:/tmp/cvs-serv1336/tools

Modified Files:
	Makefile.am 
Added Files:
	hal-luks-setup.in 
Log Message:
2005-07-20  David Zeuthen  <davidz at redhat.com>

        Patch from W. Michael Petullo <mike at flyn.org>.

        * configure.in: Add tools/hal-luks-setup to AC_OUTPUT

        * tools/hal-luks-setup.in: New file

        * fdi/policy/10osvendor/15-storage-luks.fdi: New file

        * hald/linux2/blockdev.c (blockdev_get_luks_uuid): Minor changes
        to give for informational debug



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/tools/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	8 Jul 2005 23:02:29 -0000	1.16
+++ Makefile.am	20 Jul 2005 23:43:19 -0000	1.17
@@ -43,6 +43,8 @@
 endif
 ## FSTAB_SYNC_ENABLED end
 
+sbin_SCRIPTS = hal-luks-setup
+
 EXTRA_DIST=$(man_MANS) $(MAN_IN_FILES) gen-libgphoto-hal-fdi
 
 clean-local :

--- NEW FILE: hal-luks-setup.in ---
#!/bin/bash

#   FILE: hal-luks-setup -- HAL method wrapper for luks-setup
# AUTHOR: W. Michael Petullo <mike at flyn.org>
#   DATE: 13 July 2005
# 
# Copyright (C) 2005 W. Michael Petullo <mike at 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

read password

if [ ! -f @SBINDIR@/luks-setup ]; then
	echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2
	echo Error setting up $HAL_PROP_BLOCK_DEVICE - @SBINDIR@/luks-setup not found >&2
	exit 1
fi

if ! echo $password | @SBINDIR@/luks-setup $HAL_PROP_BLOCK_DEVICE 2> /dev/null; then
	echo org.freedesktop.Hal.Device.Volume.Cryptoe.SetupError >&2
	echo Error setting up $HAL_PROP_BLOCK_DEVICE - bad password? >&2
	exit 1
fi

exit 0




More information about the hal-commit mailing list