[SCM] debian-live branch, master, updated. 1.136.1-1-1-g1ecf995

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 1ecf99578d4bb77f23ef03c58aa49d0c3a632716
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jul 15 10:40:55 2008 +0200

    Correcting httpfs2 inclusion in hook.

diff --git a/hooks/live b/hooks/live
index 4c72f0b..9aeca4b 100755
--- a/hooks/live
+++ b/hooks/live
@@ -139,15 +139,13 @@ fi
 # FUSE kernel module
 manual_add_modules fuse
 
-# FUSE filesystem: httpfs
-if [ -x /usr/bin/httpfs_ssl ]
+# FUSE filesystem: httpfs2
+if [ -x /usr/bin/httpfs2_ssl ]
 then
 	copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
-else
-	if [ -x /usr/bin/httpfs ]
-	then
-		copy_exec /usr/bin/httpfs2 /bin/httpfs
-	fi
+elif [ -x /usr/bin/httpfs2 ]
+then
+	copy_exec /usr/bin/httpfs2 /bin/httpfs
 fi
 
 # FUSE filesystem: curlftpfs
@@ -155,4 +153,3 @@ if [ -x /usr/bin/curlftpfs ]
 then
 	copy_exec /usr/bin/curlftpfs /bin
 fi
-

-- 
debian-live