Added debug level to LUKS print_info messages for bug #156410.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@464 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index aec4a246210122cf9e4696b91b95613903d91e8b..a79091874b05d2c02cb5281397ba2aa2179ac358 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
+  gen_initrd.sh:
+  Added debug level to LUKS print_info messages for bug #156410.
+
   03 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
   x86/modules_load, x86_64/modules_load:
   Added raid456 to alpha/amd64/x86 MODULES_EVMS2 and added tg3 to MODULES_NET.

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c8c7b0e2177b56887d17dcfea3ec8a5d949737be..182213f98906e5115bd5998245efe3662a91ee9a 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -451,13 +451,13 @@ create_initramfs_aux() {
        then
                if is_static /bin/cryptsetup
                then
-                       print_info "Including LUKS support"
+                       print_info 1 "Including LUKS support"
                        rm -f ${TEMP}/initramfs-aux-temp/sbin/cryptsetup
                        cp /bin/cryptsetup ${TEMP}/initramfs-aux-temp/sbin/cryptsetup
                        chmod +x "${TEMP}/initramfs-aux-temp/sbin/cryptsetup"
                else
-                       print_info "LUKS support requires static cryptsetup at /bin/cryptsetup"
-                       print_info "Not including LUKS support"
+                       print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup"
+                       print_info 1 "Not including LUKS support"
                fi
        fi
 

diff --git a/gen_initrd.sh b/gen_initrd.sh
index f1979953ce485f0604e5ce2afd864b287bd3c019..df2c4dc4c04a18ccf9d81273c321dd931b3637e2 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -237,13 +237,13 @@ create_base_initrd_sys() {
        then
                if is_static /bin/cryptsetup
                then
-                       print_info "Including LUKS support"
+                       print_info 1 "Including LUKS support"
                        rm -f ${TEMP}/initrd-temp/sbin/cryptsetup
                        cp /bin/cryptsetup ${TEMP}/initrd-temp/sbin/cryptsetup
                        chmod +x "${TEMP}/initrd-temp/sbin/cryptsetup"
                else
-                       print_info "LUKS support requires static cryptsetup at /bin/cryptsetup"
-                       print_info "Not including LUKS support"
+                       print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup"
+                       print_info 1 "Not including LUKS support"
                fi
        fi
 }