Bug#745731: initialize FSTYPE variable

2014-04-24 Thread Helge Deller 
Package: initramfs-tools
Version: 0.115
Severity: normal
Tags: patch

On the hppa platform the fstype program from klibc crashed (details in 
Bug#745660) which exposed a problem in the 
get_fstype() shell function in file scripts/functions.

In this script, fstype is called like this:
eval $(fstype ${FS} 2 /dev/null)
if [ $FSTYPE = unknown ] 
Since fstype crashed and returned nothing in the variable FSTYPE, FSTYPE 
stayed empty instead of the value unknown and as such no further analysis via 
blkid was done.

I think it makes sense to pre-initialize FSTYPE to the value unknown before 
calling fstype. That way the program logic will continue correctly if something 
with the fstype program is wrong.

Attached script fixes this.
Please apply.

Signed-off-by: Helge Deller del...@gmx.de
diff -up ./scripts/functions.org ./scripts/functions
--- ./scripts/functions.org	2014-04-24 15:44:54.104641201 +0200
+++ ./scripts/functions	2014-04-24 15:45:35.809485678 +0200
@@ -307,6 +307,7 @@ get_fstype ()
 
 	# blkid has a more complete list of file systems,
 	# but fstype is more robust
+	FSTYPE=unknown
 	eval $(fstype ${FS} 2 /dev/null)
 	if [ $FSTYPE = unknown ]   command -v blkid /dev/null 21 ; then
 		FSTYPE=$(blkid -o value -s TYPE ${FS})

linux-2.6_2.6.32-48squeeze5_multi.changes ACCEPTED into oldstable-proposed-updates-oldstable-new

2014-04-24 Thread Debian FTP Masters 
Mapping oldstable-security to oldstable-proposed-updates.

Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Tue, 08 Apr 2014 23:07:43 -0600
Source: linux-2.6
Binary: linux-tools-2.6.32 linux-source-2.6.32 linux-doc-2.6.32 
linux-manual-2.6.32 linux-patch-debian-2.6.32 firmware-linux-free 
linux-support-2.6.32-5 linux-base linux-libc-dev linux-headers-2.6.32-5-all 
linux-headers-2.6.32-5-all-alpha linux-headers-2.6.32-5-common 
linux-image-2.6.32-5-alpha-generic linux-headers-2.6.32-5-alpha-generic 
linux-image-2.6.32-5-alpha-smp linux-headers-2.6.32-5-alpha-smp 
linux-image-2.6.32-5-alpha-legacy linux-headers-2.6.32-5-alpha-legacy 
linux-headers-2.6.32-5-all-amd64 linux-image-2.6.32-5-amd64 
linux-headers-2.6.32-5-amd64 linux-image-2.6.32-5-amd64-dbg 
linux-headers-2.6.32-5-common-openvz linux-image-2.6.32-5-openvz-amd64 
linux-headers-2.6.32-5-openvz-amd64 linux-image-2.6.32-5-openvz-amd64-dbg 
linux-headers-2.6.32-5-common-vserver linux-image-2.6.32-5-vserver-amd64 
linux-headers-2.6.32-5-vserver-amd64 linux-image-2.6.32-5-vserver-amd64-dbg 
linux-headers-2.6.32-5-common-xen linux-image-2.6.32-5-xen-amd64 
linux-headers-2.6.32-5-xen-amd64
 linux-image-2.6.32-5-xen-amd64-dbg xen-linux-system-2.6.32-5-xen-amd64 
linux-headers-2.6.32-5-all-armel linux-image-2.6.32-5-iop32x 
linux-headers-2.6.32-5-iop32x linux-image-2.6.32-5-ixp4xx 
linux-headers-2.6.32-5-ixp4xx linux-image-2.6.32-5-kirkwood 
linux-headers-2.6.32-5-kirkwood linux-image-2.6.32-5-orion5x 
linux-headers-2.6.32-5-orion5x linux-image-2.6.32-5-versatile 
linux-headers-2.6.32-5-versatile linux-headers-2.6.32-5-all-hppa 
linux-image-2.6.32-5-parisc linux-headers-2.6.32-5-parisc 
linux-image-2.6.32-5-parisc-smp linux-headers-2.6.32-5-parisc-smp 
linux-image-2.6.32-5-parisc64 linux-headers-2.6.32-5-parisc64 
linux-image-2.6.32-5-parisc64-smp linux-headers-2.6.32-5-parisc64-smp 
linux-headers-2.6.32-5-all-i386 linux-image-2.6.32-5-486 
linux-headers-2.6.32-5-486 linux-image-2.6.32-5-686 linux-headers-2.6.32-5-686 
linux-image-2.6.32-5-686-bigmem linux-headers-2.6.32-5-686-bigmem 
linux-image-2.6.32-5-686-bigmem-dbg linux-image-2.6.32-5-openvz-686
 linux-headers-2.6.32-5-openvz-686 linux-image-2.6.32-5-openvz-686-dbg 
linux-image-2.6.32-5-vserver-686 linux-headers-2.6.32-5-vserver-686 
linux-image-2.6.32-5-vserver-686-bigmem 
linux-headers-2.6.32-5-vserver-686-bigmem 
linux-image-2.6.32-5-vserver-686-bigmem-dbg linux-image-2.6.32-5-xen-686 
linux-headers-2.6.32-5-xen-686 linux-image-2.6.32-5-xen-686-dbg 
xen-linux-system-2.6.32-5-xen-686 linux-headers-2.6.32-5-all-ia64 
linux-image-2.6.32-5-itanium linux-headers-2.6.32-5-itanium 
linux-image-2.6.32-5-mckinley linux-headers-2.6.32-5-mckinley 
linux-image-2.6.32-5-vserver-itanium linux-headers-2.6.32-5-vserver-itanium 
linux-image-2.6.32-5-vserver-mckinley linux-headers-2.6.32-5-vserver-mckinley 
linux-headers-2.6.32-5-all-m68k linux-image-2.6.32-5-amiga 
linux-headers-2.6.32-5-amiga linux-image-2.6.32-5-atari 
linux-headers-2.6.32-5-atari linux-image-2.6.32-5-bvme6000 
linux-headers-2.6.32-5-bvme6000 linux-image-2.6.32-5-mac 
linux-headers-2.6.32-5-mac
 linux-image-2.6.32-5-mvme147 linux-headers-2.6.32-5-mvme147 
linux-image-2.6.32-5-mvme16x linux-headers-2.6.32-5-mvme16x 
linux-headers-2.6.32-5-all-mips linux-image-2.6.32-5-r4k-ip22 
linux-headers-2.6.32-5-r4k-ip22 linux-image-2.6.32-5-r5k-ip32 
linux-headers-2.6.32-5-r5k-ip32 linux-image-2.6.32-5-sb1-bcm91250a 
linux-headers-2.6.32-5-sb1-bcm91250a linux-image-2.6.32-5-sb1a-bcm91480b 
linux-headers-2.6.32-5-sb1a-bcm91480b linux-image-2.6.32-5-4kc-malta 
linux-headers-2.6.32-5-4kc-malta linux-image-2.6.32-5-5kc-malta 
linux-headers-2.6.32-5-5kc-malta linux-headers-2.6.32-5-all-mipsel 
linux-image-2.6.32-5-r5k-cobalt linux-headers-2.6.32-5-r5k-cobalt 
linux-headers-2.6.32-5-all-powerpc linux-image-2.6.32-5-powerpc 
linux-headers-2.6.32-5-powerpc linux-image-2.6.32-5-powerpc-smp 
linux-headers-2.6.32-5-powerpc-smp linux-image-2.6.32-5-powerpc64 
linux-headers-2.6.32-5-powerpc64 linux-image-2.6.32-5-vserver-powerpc 
linux-headers-2.6.32-5-vserver-powerpc
 linux-image-2.6.32-5-vserver-powerpc64 
linux-headers-2.6.32-5-vserver-powerpc64 linux-headers-2.6.32-5-all-s390 
linux-image-2.6.32-5-s390x linux-headers-2.6.32-5-s390x 
linux-image-2.6.32-5-s390x-tape linux-image-2.6.32-5-vserver-s390x 
linux-headers-2.6.32-5-vserver-s390x linux-headers-2.6.32-5-all-sh4 
linux-image-2.6.32-5-sh7751r linux-headers-2.6.32-5-sh7751r 
linux-image-2.6.32-5-sh7785lcr linux-headers-2.6.32-5-sh7785lcr 
linux-headers-2.6.32-5-all-sparc linux-image-2.6.32-5-sparc64 
linux-headers-2.6.32-5-sparc64 linux-image-2.6.32-5-sparc64-smp 
linux-headers-2.6.32-5-sparc64-smp linux-image-2.6.32-5-vserver-sparc64 
linux-headers-2.6.32-5-vserver-sparc64
 linux-headers-2.6.32-5-all-sparc64
Architecture: source all
Version: 2.6.32-48squeeze5
Distribution: squeeze-security
Urgency: high
Maintainer: Debian Kernel Team debian-kernel@lists.debian.org
Changed-By: dann