diff -u tiger-3.2.2/systems/Linux/2/gen_mounts tiger-3.2.2/systems/Linux/2/gen_mounts --- tiger-3.2.2/systems/Linux/2/gen_mounts +++ tiger-3.2.2/systems/Linux/2/gen_mounts @@ -54,6 +54,7 @@ # of unexistant symlinks (See Debian bug 434333) # Linux/2/gen_mounts - 11/27/2008 - Added ecryptfs, used by ecryptfs-utils (See Debian bug 506512) # - Fix bashism (Debian bug #505939) +# Linux/2/gen_mounts - 01/19/2009 - Added ext4 as a local FS #----------------------------------------------------------------------------- # @@ -105,6 +106,7 @@ [ "$1" = "ext" ] && LOCAL=0 [ "$1" = "ext2" ] && LOCAL=0 [ "$1" = "ext3" ] && LOCAL=0 + [ "$1" = "ext4" ] && LOCAL=0 [ "$1" = "auto" ] && LOCAL=0 [ "$1" = "vzfs" ] && LOCAL=0 # VPS virtual partition [ "$1" = "reiserfs" ] && LOCAL=0 diff -u tiger-3.2.2/debian/changelog tiger-3.2.2/debian/changelog --- tiger-3.2.2/debian/changelog +++ tiger-3.2.2/debian/changelog @@ -1,3 +1,14 @@ +tiger (1:3.2.2-8ubuntu2) jaunty; urgency=low + + [ Aurimas Fischer ] + * system/Linux/2/gen_mounts: + - Added ext4 as a local FS (LP: #318933) + + [ Colin Watson ] + * scripts/check_rootdir: Check for inode 2 on ext4 as well as ext2/3. + + -- Colin Watson Wed, 21 Jan 2009 19:42:37 +0000 + tiger (1:3.2.2-8ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes (LP: #303893): only in patch2: unchanged: --- tiger-3.2.2.orig/scripts/check_rootdir +++ tiger-3.2.2/scripts/check_rootdir @@ -90,7 +90,7 @@ # Checking to see if the root directory is on the correct INODE number inode=`$LS -di / | $AWK '{print $1}'` fstype=`$GETFS | $GREP " / " | $AWK -F " " '{ print $5;}'` -[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" ] && +[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" -o "$fstype" = "ext4" ] && message FAIL rootdir001f "" "Root directory on incorrect inode"