root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

simplified check

Browse source
This commit is contained in:
Tobias Powalowski 2010-07-01 11:28:04 +02:00
parent da511362d5
commit 8580cfa2a7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr/share/archboot/installer/setup
View file

@ -2126,14 +2126,13 @@ check_btrfs_filesystem_creation() {
SKIP_FILESYSTEM="no" SKIP_FILESYSTEM="no"
SKIP_ASK_SUBVOLUME="no" SKIP_ASK_SUBVOLUME="no"
for i in $(grep $PART[:#] /tmp/.parts); do for i in $(grep $PART[:#] /tmp/.parts); do
if [ "$(echo $i | grep ":btrfs:")" -a "$(echo $i | cut -d: -f 4 | grep yes)" ]; then
DETECT_CREATE_FILESYSTEM="yes"
fi
[ "$DETECT_CREATE_FILESYSTEM" = "yes" ] && SKIP_ASK_SUBVOLUME="yes"
if [ "$(echo $i | grep ":btrfs:")" ]; then if [ "$(echo $i | grep ":btrfs:")" ]; then
FSTYPE="btrfs" FSTYPE="btrfs"
SUBVOLUME="$SUBVOLUME#$(echo $i | cut -d: -f 9)" SUBVOLUME="$SUBVOLUME#$(echo $i | cut -d: -f 9)"
SKIP_FILESYSTEM="yes" SKIP_FILESYSTEM="yes"
# check on filesystem creation, skip subvolume asking then!
[ "$(echo $i | cut -d: -f 4 | grep yes)" ] && DETECT_CREATE_FILESYSTEM="yes"
[ "$DETECT_CREATE_FILESYSTEM" = "yes" ] && SKIP_ASK_SUBVOLUME="yes"
fi fi
done done
} }