[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#585419: drop vol_id related code from get_fstype in /usr/share/initramfs-tools/scripts/functions



* Christoph Anton Mitterer <calestyo@scientia.net> [Thu Jun 10, 2010 at 02:51:04PM +0200]:

> May I suggest to drop the code from get_fstype in /usr/share/initramfs-tools/scripts/functions
> that uses vol_id.

> AFAIK vol_id is no longer available in udev or any other Debian package,
> so this is dead code.

> Attached is a patch for this.

> --- /usr/share/initramfs-tools/scripts/functions	2010-06-08 12:10:38.000000000 +0200
> +++ /usr/share/initramfs-tools/scripts/functions	2010-06-10 14:50:25.822262987 +0200
> @@ -285,13 +285,10 @@
>  	local FS FSTYPE FSSIZE RET
>  	FS="${1}"

> -	# vol_id has a more complete list of file systems,
> -	# but fstype is more robust
> +	# blk_id has a more complete list of file systems, but fstype is more robust
>  	eval $(fstype "${FS}" 2> /dev/null)
>  	if [ "$FSTYPE" = "unknown" ] &&  command -v blkid >/dev/null 2>&1 ; then
>  		FSTYPE=$(blkid -o value -s TYPE "${FS}")
> -	elif [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
> -		FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
>  	fi
>  	RET=$?

Yeah, it's just fallback code.

udev in lenny provides /lib/udev/vol_id, though lenny's e2fsprogs
(which is an essential package) also ships blkid - so this should be
save.

maks, any objections against applying this patch?

regards,
-mika-

Attachment: signature.asc
Description: Digital signature


Reply to: