[Pkg-loop-aes-commits] r1417 - in /trunk/loop-aes-utils: ./ debian/initramfs/conf

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 14:21:49 2007
New Revision: 1417

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1417
Log:
Unconditionally set UMASK=0077

Modified:
    trunk/loop-aes-utils/   (props changed)
    trunk/loop-aes-utils/debian/initramfs/conf

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 14:21:49 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9930
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9931
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-alternative:120
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-dpatch:196
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/trunk/current:338

Modified: trunk/loop-aes-utils/debian/initramfs/conf
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs/conf?rev=1417&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs/conf (original)
+++ trunk/loop-aes-utils/debian/initramfs/conf Sat Aug 11 14:21:49 2007
@@ -1,63 +1,6 @@
-# This script is sourced by initramfs-tools; It should not exit
-
 # Enable setup of keymaps during early boot
 KEYMAP=y
 
-get_rootoptions() {
-    [ -r /etc/fstab ] || return
-
-    grep '^[^#]' /etc/fstab | ( \
-	while read dev mount type options dump pass; do
-	    if [ "${mount}" = "/" ]; then
-		echo "rootoptions=\"${options}\""
-		return
-	    fi
-	done )
-}
-
-set_UMASK_p() {
-
-    case "${INITRAMFS_LOOPAES}" in
-	0|n|no|off)
-	    return 1
-	    ;;
-	1|y|yes|on)
-	    ;;
-	auto)
-	    ;;
-	*)
-	    if [ -n "${INITRAMFS_LOOPAES}" ]; then
-		echo "WARNING! (loop-aes) ignoring invalid INITRAMFS_LOOPAES value: '${INITRAMFS_LOOPAES}'" 1>&2
-	    fi
-	    # Default not doing anything
-	    return 1
-	    ;;
-    esac
-
-    local rootoptions
-    eval $(get_rootoptions)
-    [ -n "${rootoptions}" ] || return 1
-
-    local opt
-    local IFS=", "
-    for opt in $rootoptions; do
-	case "$opt" in
-	    gpgkey=*)
-		return 0
-		;;
-	    gpghome=*)
-		return 0
-		;;
-	esac
-    done
-    return 1
-}
-
-if set_UMASK_p; then
-    # When the root is on loop-aes with gnupg use, cryptographic keys
-    # may be in the initramfs; hence restrict the umask.
-    UMASK=0077
-fi
-
-unset set_UMASK_p get_rootoptions
-
+# When the root is on loop-aes with gnupg use, cryptographic keys
+# may be in the initramfs; hence restrict the umask.
+UMASK=0077