diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-20 22:06:57 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-20 22:06:57 +0100 |
| commit | e079b88505229fe79bd03a3c542f277ffaa4c30e (patch) | |
| tree | 6a17b3ca15a3257d1f92872c530e842b94b1b485 | |
| parent | c1b8281c0b5688a3f9da90cbd8eb1a2453f1268e (diff) | |
| parent | 28513c226ceb967e20889af1bd9a679dcd3b21e5 (diff) | |
Merge branch 'btrfs'
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index af2c2b5..f092bd1 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -37,7 +37,7 @@ TMP_BLOCKDEVICES=$RUNTIME_DIR/aif-blockdata declare -A filesystem_programs=(["swap"]="mkswap" ["reiserfs"]="mkreiserfs" ["lvm-pv"]="pvcreate" ["lvm-vg"]="vgcreate" ["lvm-lv"]="lvcreate" ["dm_crypt"]="cryptsetup") -for simple in ext2 ext3 ext4 nilfs2 xfs jfs vfat +for simple in ext2 ext3 ext4 nilfs2 xfs jfs vfat btrfs do filesystem_programs+=([$simple]=mkfs.$simple) done @@ -49,7 +49,7 @@ do done # names for filesystems (which are shown to users in dialogs etc, don't use spaces!) -declare -A filesystem_names=(["nilfs2"]="Nilfs2 (EXPERIMENTAL)" ["vfat"]="vFat" ["dm_crypt"]="dm_crypt (LUKS)" ["lvm-pv"]="lvm Physical Volume" ["lvm-vg"]="lvm Volume Group" ["lvm-lv"]="lvm Logical Volume") +declare -A filesystem_names=(["nilfs2"]="Nilfs2 (EXPERIMENTAL)" ["btrfs"]="Btrfs (EXPERIMENTAL)" ["vfat"]="vFat" ["dm_crypt"]="dm_crypt (LUKS)" ["lvm-pv"]="lvm Physical Volume" ["lvm-vg"]="lvm Volume Group" ["lvm-lv"]="lvm Logical Volume") for i in ext2 ext3 ext4 reiserfs xfs jfs swap do name=$(echo $i | capitalize) @@ -57,9 +57,9 @@ do done # specify which filesystems can be stored on which blockdevices -fs_on_raw=(swap ext2 ext3 ext4 reiserfs nilfs2 xfs jfs vfat dm_crypt lvm-pv) -fs_on_lvm_lv=(swap ext2 ext3 ext4 reiserfs nilfs2 xfs jfs vfat dm_crypt) -fs_on_dm_crypt=(swap ext2 ext3 ext4 reiserfs nilfs2 xfs jfs vfat lvm-pv) +fs_on_raw=(swap ext2 ext3 ext4 reiserfs nilfs2 xfs jfs vfat dm_crypt lvm-pv btrfs) +fs_on_lvm_lv=(swap ext2 ext3 ext4 reiserfs nilfs2 xfs jfs vfat dm_crypt btrfs) +fs_on_dm_crypt=(swap ext2 ext3 ext4 reiserfs nilfs2 xfs jfs vfat lvm-pv btrfs) fs_on_lvm_pv=(lvm-vg) fs_on_lvm_vg=(lvm-lv) @@ -78,7 +78,7 @@ fs_label_mandatory=('lvm-vg' 'lvm-lv' 'dm_crypt') fs_label_optional=('ext2' 'ext3' 'ext4' 'reiserfs' 'nilfs2' 'xfs' 'jfs' 'vfat') # list needed packages per filesystem -declare -A filesystem_pkg=(["lvm-pv"]="lvm2" ["xfs"]="xfsprogs" ["jfs"]="jfsutils" ["reiserfs"]="reiserfsprogs" ["nilfs2"]="nilfs-utils" ["vfat"]="dosfstools" ["dm_crypt"]="cryptsetup") +declare -A filesystem_pkg=(["lvm-pv"]="lvm2" ["xfs"]="xfsprogs" ["jfs"]="jfsutils" ["reiserfs"]="reiserfsprogs" ["nilfs2"]="nilfs-utils" ["vfat"]="dosfstools" ["dm_crypt"]="cryptsetup" ["btrfs"]=btrfs-progs-unstable) for i in ext2 ext3 ext4 do filesystem_pkg+=([$i]=e2fsprogs) |