[Pkg-loop-aes-commits] r1418 - in /trunk/loop-aes-utils: ./ debian/initramfs/hook debian/initramfs/script

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 14:21:57 2007
New Revision: 1418

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1418
Log:
Rename conf.d file to loopaesroot to avoid conflicts with conf.d/loopaes

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

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 14:21:57 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9931
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9932
 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/hook
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs/hook?rev=1418&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs/hook (original)
+++ trunk/loop-aes-utils/debian/initramfs/hook Sat Aug 11 14:21:57 2007
@@ -53,14 +53,6 @@
 	    echo "WARNING| (loop-aes) Unknown encryption type $1" 1>&2
 	    ;;
     esac
-}
-
-iterate_cipher_module() {
-    local cipher
-    local IFS=":"
-    for cipher in $2; do
-	$1 "loop_${cipher}"
-    done
 }
 
 get_root_opts() {
@@ -199,14 +191,7 @@
 fi
 loopaes_opts="${loopaes_opts},gpghome=/.gnupg"
 
-# mkinitramfs has installed a symlink to
-# /etc/initramfs-tools/conf.d/loopaes or
-# /usr/share/initramfs-tools/conf.d/loopaes; that is not desirable
-# for us as what we want there at boot time and at initramfs creation
-# time is not the same!
-rm -f ${DESTDIR}/conf/conf.d/loopaes
-
-echo "LOOPAESOPTS=\"$loopaes_opts\"" > ${DESTDIR}/conf/conf.d/loopaes
+echo "LOOPAESOPTS=\"$loopaes_opts\"" > ${DESTDIR}/conf/conf.d/loopaesroot
 
 copy_exec /sbin/losetup /sbin/
 

Modified: trunk/loop-aes-utils/debian/initramfs/script
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs/script?rev=1418&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs/script (original)
+++ trunk/loop-aes-utils/debian/initramfs/script Sat Aug 11 14:21:57 2007
@@ -46,8 +46,8 @@
 
 get_options()
 {
-    # Do we have any settings from the /conf/conf.d/loopaes file?
-    [ -r /conf/conf.d/loopaes ] && . /conf/conf.d/loopaes
+    # Do we have any settings from the /conf/conf.d/loopaesroot file?
+    [ -r /conf/conf.d/loopaesroot ] && . /conf/conf.d/loopaesroot
     loopaes_opts="${LOOPAESOPTS}"
 
     # Does the kernel boot command line override them?