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

remove already in use subvolumes

Browse source
This commit is contained in:
Tobias Powalowski 2010-07-01 12:09:25 +02:00
parent 8580cfa2a7
commit 3f82f6e35b
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2019,16 +2019,30 @@ find_btrfs_subvolume() {
[ "$1" ] && echo $1
done
umount_btrfs
else
# use the one from /tmp/.parts
echo $SUBVOLUME
[ "$1" ] && echo $1
### NOT NEEDED, you will be asked for create new subvolumes then!
#else
# # use the one from /tmp/.parts
# echo $SUBVOLUME
# [ "$1" ] && echo $1
fi
}
subvolumes_in_use() {
SUBVOLUME_IN_USE=""
for i in $(grep $PART[:#] /tmp/.parts); do
if [ "$(echo $i | grep ":btrfs:")" ]; then
SUBVOLUME_IN_USE="$SUBVOLUME_IN_USE $(echo $i | cut -d: -f 9)"
fi
done
}
choose_btrfs_subvolume () {
BTRFS_SUBVOLUME="NONE"
SUBVOLUMES=$(find_btrfs_subvolume _)
subvolumes_in_use
for i in $SUBVOLUME_IN_USE; do
SUBVOLUMES=$(echo $SUBVOLUMES | sed -e "s#$i\ _##g")
done
if [ -n "$SUBVOLUMES" ] ; then
DIALOG --menu "Select the subvolume to mount" 21 50 13 $SUBVOLUMES 2>$ANSWER || return 1
BTRFS_SUBVOLUME=$(cat $ANSWER)
@ -2128,7 +2142,7 @@ check_btrfs_filesystem_creation() {
for i in $(grep $PART[:#] /tmp/.parts); do
if [ "$(echo $i | grep ":btrfs:")" ]; then
FSTYPE="btrfs"
SUBVOLUME="$SUBVOLUME#$(echo $i | cut -d: -f 9)"
SUBVOLUME="$SUBVOLUME $(echo $i | cut -d: -f 9)"
SKIP_FILESYSTEM="yes"
# check on filesystem creation, skip subvolume asking then!
[ "$(echo $i | cut -d: -f 4 | grep yes)" ] && DETECT_CREATE_FILESYSTEM="yes"