Commit 742f63e05b548eafcc90c16176089ffd8d4c2dde

Authored by Silvan Calarco
1 parent 9c680504e3
Exists in master

installer.kmdr: small fixes to support freshly added filesystem types

Showing 1 changed file with 10 additions and 7 deletions Side-by-side Diff

installer/installer.kmdr
... ... @@ -1653,7 +1653,7 @@
1653 1653 thispart="$thispart<td width=120><b>@i18n("OK for swap")</b></td>"
1654 1654 fi
1655 1655 ;;
1656   - unformatted|linux|ext2|ext3|ext4|reiserfs|reiser4)
  1656 + unformatted|linux|ext2|ext3|ext4|btrfs|nilfs2|xfs|jfs|reiserfs|reiser4)
1657 1657 if [ $systemrequired -le $volsize ]; then
1658 1658 linuxok=1
1659 1659 thispart="$thispart<td width=120><b>@i18n("OK for system")</b></td>"
1660 1660  
... ... @@ -1938,14 +1938,14 @@
1938 1938 if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
1939 1939 partlabel="$partlabel<br>${device:5} $fstype $volname $volsize MB"
1940 1940 case "$fstype" in
1941   - ext2|ext3|ext4|reiserfs|reiser4|unformatted)
  1941 + ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
1942 1942 dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5} ($fstype,$volname,$volsize MB${add_info})" 0 ;;
1943 1943 *) ;;
1944 1944 esac
1945 1945 elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
1946 1946 case "$fstype" in
1947 1947 swap|iso9660) ;;
1948   - ext2|ext3|ext4|reiserfs|reiser4|unformatted) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5} ($fstype,$volname,$volsize MB${add_info})" 0 ;;
  1948 + 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 ;;
1949 1949 *) ;;
1950 1950 esac
1951 1951 fi
1952 1952  
... ... @@ -2622,14 +2622,14 @@
2622 2622 if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
2623 2623 partlabel="$partlabel<br>${device:5} $fstype $volname $volsize MB"
2624 2624 case "$fstype" in
2625   - ext2|ext3|ext4|reiserfs|reiser4|unformatted)
  2625 + ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
2626 2626 dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_2 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
2627 2627 *) ;;
2628 2628 esac
2629 2629 elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
2630 2630 case "$fstype" in
2631 2631 swap|iso9660) ;;
2632   - ext2|ext3|ext4|reiserfs|reiser4|unformatted)
  2632 + ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
2633 2633 dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_2 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
2634 2634 *) ;;
2635 2635 esac
... ... @@ -2829,6 +2829,9 @@
2829 2829 <verstretch>0</verstretch>
2830 2830 </sizepolicy>
2831 2831 </property>
  2832 + <property name="name">
  2833 + <cstring>fsbadblocks_2</cstring>
  2834 + </property>
2832 2835 <property name="text">
2833 2836 <string>Check for &amp;bad blocks (slow!)</string>
2834 2837 </property>
2835 2838  
... ... @@ -3110,14 +3113,14 @@
3110 3113 if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
3111 3114 partlabel="$partlabel&lt;br&gt;${device:5} $fstype $volname $volsize MB"
3112 3115 case "$fstype" in
3113   - ext2|ext3|ext4|reiserfs|reiser4|unformatted)
  3116 + ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
3114 3117 dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_3 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
3115 3118 *) ;;
3116 3119 esac
3117 3120 elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
3118 3121 case "$fstype" in
3119 3122 swap|iso9660) ;;
3120   - ext2|ext3|ext4|reiserfs|reiser4|unformatted)
  3123 + ext2|ext3|ext4|btrfs|nilfs2|jfs|xfs|reiserfs|reiser4|unformatted)
3121 3124 dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox_3 "${device:5} ($fstype,$volname,$volsize MB${add_info})" 1 ;;
3122 3125 *) ;;
3123 3126 esac