summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-12-29 18:33:57 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-12-29 18:33:57 +0100
commitb1ab860219eec51f9bb1cf786e6f570309f52df7 (patch)
tree5d82cbde9cca23149570619841953704cc192160 /src
parent2b749ae2e9e3750c937fccac8b71353040e00128 (diff)
ext4 support
Diffstat (limited to 'src')
-rw-r--r--src/core/libs/lib-blockdevices-filesystems.sh2
-rw-r--r--src/core/libs/lib-ui-interactive.sh3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index bb44295..bf5fee3 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -649,6 +649,7 @@ process_filesystem ()
reiserfs) yes | mkreiserfs $part $opts >$LOG 2>&1; ret=$? ;;
ext2) mke2fs "$part" $opts >$LOG 2>&1; ret=$? ;;
ext3) mke2fs -j $part $opts >$LOG 2>&1; ret=$? ;;
+ ext4) mkfs.ext4 $part $opts >$LOG 2>&1; ret=$? ;;
vfat) mkfs.vfat $part $opts >$LOG 2>&1; ret=$? ;;
swap) mkswap $part $opts >$LOG 2>&1; ret=$? ;;
dm_crypt) [ -z "$fs_params" ] && fs_params='-c aes-xts-plain -y -s 512';
@@ -721,6 +722,7 @@ get_filesystem_program ()
[ $1 = swap ] && echo mkswap && return 0
[ $1 = ext2 ] && echo mkfs.ext2 && return 0
[ $1 = ext3 ] && echo mkfs.ext3 && return 0
+ [ $1 = ext4 ] && echo mkfs.ext4 && return 0
[ $1 = reiserfs ] && echo mkreiserfs && return 0
[ $1 = xfs ] && echo mkfs.xfs && return 0
[ $1 = jfs ] && echo mkfs.jfs && return 0
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 5fb1aa6..c013e61 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -117,6 +117,7 @@ interactive_autoprepare()
FSOPTS=
which `get_filesystem_program ext2` &>/dev/null && FSOPTS="$FSOPTS ext2 Ext2"
which `get_filesystem_program ext3` &>/dev/null && FSOPTS="$FSOPTS ext3 Ext3"
+ which `get_filesystem_program ext4` &>/dev/null && FSOPTS="$FSOPTS ext4 Ext4"
which `get_filesystem_program reiserfs` &>/dev/null && FSOPTS="$FSOPTS reiserfs Reiser3"
which `get_filesystem_program xfs` &>/dev/null && FSOPTS="$FSOPTS xfs XFS"
which `get_filesystem_program jfs` &>/dev/null && FSOPTS="$FSOPTS jfs JFS"
@@ -266,6 +267,7 @@ interactive_filesystem ()
# swap raw/lvm-lv/dm_crypt no no no no no no
# ext 2 raw/lvm-lv/dm_crypt optional optional no no optional no
# ext 3 raw/lvm-lv/dm_crypt optional optional no no optional no
+ # ext 4 raw/lvm-lv/dm_crypt optional optional no no optional no
# reiserFS raw/lvm-lv/dm_crypt optional optional no no optional no
# xfs raw/lvm-lv/dm_crypt optional optional no no optional no
# jfs raw/lvm-lv/dm_crypt optional optional no no optional no
@@ -281,6 +283,7 @@ interactive_filesystem ()
[ $part_type = raw -o $part_type = lvm-lv -o $part_type = dm_crypt ] && which `get_filesystem_program swap` &>/dev/null && FSOPTS="$FSOPTS swap Swap"
[ $part_type = raw -o $part_type = lvm-lv -o $part_type = dm_crypt ] && which `get_filesystem_program ext2` &>/dev/null && FSOPTS="$FSOPTS ext2 Ext2"
[ $part_type = raw -o $part_type = lvm-lv -o $part_type = dm_crypt ] && which `get_filesystem_program ext3` &>/dev/null && FSOPTS="$FSOPTS ext3 Ext3"
+ [ $part_type = raw -o $part_type = lvm-lv -o $part_type = dm_crypt ] && which `get_filesystem_program ext4` &>/dev/null && FSOPTS="$FSOPTS ext4 Ext4"
[ $part_type = raw -o $part_type = lvm-lv -o $part_type = dm_crypt ] && which `get_filesystem_program reiserfs` &>/dev/null && FSOPTS="$FSOPTS reiserfs Reiser3"
[ $part_type = raw -o $part_type = lvm-lv -o $part_type = dm_crypt ] && which `get_filesystem_program xfs` &>/dev/null && FSOPTS="$FSOPTS xfs XFS"
[ $part_type = raw -o $part_type = lvm-lv -o $part_type = dm_crypt ] && which `get_filesystem_program jfs` &>/dev/null && FSOPTS="$FSOPTS jfs JFS"