openmamba/livecd-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Silvan Calarco 2015-01-25 20:15:05 +01:00
parent 9c680504e3
commit 742f63e05b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
installer/installer.kmdr
View File

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