From 742f63e05b548eafcc90c16176089ffd8d4c2dde Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 25 Jan 2015 20:15:05 +0100
Subject: [PATCH] installer.kmdr: small fixes to support freshly added
 filesystem types

---
 installer/installer.kmdr | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/installer/installer.kmdr b/installer/installer.kmdr
index 335ac67..949f3a7 100755
--- a/installer/installer.kmdr
+++ b/installer/installer.kmdr
@@ -1653,7 +1653,7 @@ for d in $devices; do
                   thispart="$thispart&lt;td width=120&gt;&lt;b&gt;@i18n("OK for swap")&lt;/b&gt;&lt;/td&gt;"
 	          fi
                ;;
-         unformatted|linux|ext2|ext3|ext4|reiserfs|reiser4)
+         unformatted|linux|ext2|ext3|ext4|btrfs|nilfs2|xfs|jfs|reiserfs|reiser4)
                if [ $systemrequired -le $volsize ]; then
                   linuxok=1
                   thispart="$thispart&lt;td width=120&gt;&lt;b&gt;@i18n("OK for system")&lt;/b&gt;&lt;/td&gt;"
@@ -1938,14 +1938,14 @@ for device in $devices; do
    if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
       partlabel="$partlabel&lt;br&gt;${device:5} $fstype $volname $volsize MB"
       case "$fstype" in
-         ext2|ext3|ext4|reiserfs|reiser4|unformatted)
+         ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
             dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5} ($fstype,$volname,$volsize MB${add_info})" 0 ;;
          *) ;;
       esac
    elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
       case "$fstype" in
          swap|iso9660) ;;
-         ext2|ext3|ext4|reiserfs|reiser4|unformatted) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5} ($fstype,$volname,$volsize MB${add_info})" 0 ;;
+         ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5} ($fstype,$volname,$volsize MB${add_info})" 0 ;;
          *) ;;
       esac
    fi
@@ -2622,14 +2622,14 @@ for device in $devices; do
    if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
       partlabel="$partlabel&lt;br&gt;${device:5} $fstype $volname $volsize MB"
       case "$fstype" in
-         ext2|ext3|ext4|reiserfs|reiser4|unformatted)
+         ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
             dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_2 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
          *) ;;
       esac
    elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
       case "$fstype" in
          swap|iso9660) ;;
-         ext2|ext3|ext4|reiserfs|reiser4|unformatted)
+         ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
             dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_2 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
          *) ;;
       esac
@@ -2829,6 +2829,9 @@ done
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
+                        <property name="name">
+                            <cstring>fsbadblocks_2</cstring>
+                        </property>
                         <property name="text">
                             <string>Check for &amp;bad blocks (slow!)</string>
                         </property>
@@ -3110,14 +3113,14 @@ for device in $devices; do
    if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
       partlabel="$partlabel&lt;br&gt;${device:5} $fstype $volname $volsize MB"
       case "$fstype" in
-         ext2|ext3|ext4|reiserfs|reiser4|unformatted)
+         ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
             dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_3 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
          *) ;;
       esac
    elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
       case "$fstype" in
          swap|iso9660) ;;
-         ext2|ext3|ext4|reiserfs|reiser4|unformatted)
+         ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
             dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_3 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
          *) ;;
       esac