This commit is contained in:
parent
54bb218804
commit
934bcc0eb5
@ -1,6 +1,6 @@
|
||||
--- scripts/umount.crypt 2006-07-11 17:01:46.000000000 -0400
|
||||
+++ scripts/umount.crypt 2007-01-23 10:35:30.000000000 -0500
|
||||
@@ -57,6 +57,15 @@
|
||||
--- scripts/umount.crypt
|
||||
+++ scripts/umount.crypt 2007/09/21 09:14:07
|
||||
@@ -57,9 +57,19 @@
|
||||
exit 1;
|
||||
fi;
|
||||
|
||||
@ -16,7 +16,11 @@
|
||||
# ask cryptsetup about the underlying device
|
||||
#
|
||||
REALDEVICE=` "$CRYPTSETUP" status "$DMDEVICE" | sed -n '/device/s/[ ]*device:[ ]*//p'`;
|
||||
@@ -69,7 +78,7 @@
|
||||
+IMGDEVICE=`"$LOSETUP" -a | grep "$REALDEVICE" | awk -F\( '{ print $2 }' | sed 's/)//'`
|
||||
|
||||
"$UMOUNT" "$1";
|
||||
if [ $? -ne 0 ]; then
|
||||
@@ -69,7 +79,7 @@
|
||||
|
||||
# Check for LUKS
|
||||
#
|
||||
@ -25,3 +29,16 @@
|
||||
"$CRYPTSETUP" luksClose "$DMDEVICE";
|
||||
else
|
||||
"$CRYPTSETUP" remove "$DMDEVICE";
|
||||
@@ -87,3 +97,12 @@
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
+
|
||||
+if echo "$IMGDEVICE" | grep ^/dev/loop >/dev/null; then
|
||||
+ "$LOSETUP" -d "$IMGDEVICE";
|
||||
+ if [ $? -ne 0 ]; then
|
||||
+ echo "${0##*/}: error removing $IMGDEVICE" >&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 21 11:39:03 CEST 2007 - mc@suse.de
|
||||
|
||||
- remove the loopdevice for the image too
|
||||
[#326802]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 20 15:05:57 CEST 2007 - mc@suse.de
|
||||
|
||||
|
@ -14,7 +14,7 @@ Name: pam_mount
|
||||
BuildRequires: glib2-devel openssl-devel pam-devel zlib-devel
|
||||
Summary: A PAM Module that can Mount Volumes for a User Session.
|
||||
Version: 0.18
|
||||
Release: 79
|
||||
Release: 83
|
||||
Requires: lsof coreutils util-linux
|
||||
Recommends: cryptsetup
|
||||
License: LGPL v2 or later
|
||||
@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_mandir}/man8/pmvarrun.8.gz
|
||||
%doc %{_mandir}/man8/umount.crypt.8.gz
|
||||
%changelog
|
||||
* Fri Sep 21 2007 - mc@suse.de
|
||||
- remove the loopdevice for the image too
|
||||
[#326802]
|
||||
* Thu Sep 20 2007 - mc@suse.de
|
||||
- add required dependencies [#326802]
|
||||
* Wed Apr 04 2007 - crivera@suse.de
|
||||
|
Loading…
x
Reference in New Issue
Block a user