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

smooth btrfs chosing options added

Browse source
This commit is contained in:
Tobias Powalowski 2010-07-01 11:09:06 +02:00
parent 596707c7bf
commit a00e36521f
1 changed files with 49 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1955,20 +1955,32 @@ select_btrfs_raid_devices () {
# check btrfs subvolume # check btrfs subvolume
check_btrfs_subvolume(){ check_btrfs_subvolume(){
mount_btrfs if [ "$DETECT_CREATE_FILESYSTEM" = "no" ]; then
for i in $(btrfs subvolume list $BTRFSMP | cut -d " " -f 7); do mount_btrfs
if [ "$(echo $i | grep "$BTRFS_SUBVOLUME"$)" ]; then for i in $(btrfs subvolume list $BTRFSMP | cut -d " " -f 7); do
if [ "$(echo $i | grep "$BTRFS_SUBVOLUME"$)" ]; then
DIALOG --msgbox "ERROR: You have defined 2 identical SUBVOLUME names! Please enter another name." 8 65
BTRFS_SUBVOLUME=""
fi
done
umount_btrfs
else
if [ "$(echo $SUBVOLUME | egrep "$BTRFS_SUBVOLUME")" ]; then
DIALOG --msgbox "ERROR: You have defined 2 identical SUBVOLUME names! Please enter another name." 8 65 DIALOG --msgbox "ERROR: You have defined 2 identical SUBVOLUME names! Please enter another name." 8 65
BTRFS_SUBVOLUME="" BTRFS_SUBVOLUME=""
fi fi
done fi
umount_btrfs
} }
prepare_btrfs_subvolume() { prepare_btrfs_subvolume() {
DOSUBVOLUME="no" DOSUBVOLUME="no"
BTRFS_SUBVOLUME="" BTRFS_SUBVOLUME=""
DIALOG --yesno "Would you like to create a subvolume on $PART?" 0 0 && DOSUBVOLUME="yes" if [ "$SKIP_ASK_SUBVOLUME" = "no" ]; then
DIALOG --yesno "Would you like to create a subvolume on $PART?" 0 0 && DOSUBVOLUME="yes"
else
### TODO: need to check for available free subvolumes! If no subvolumes present go on create one!
DOSUBVOLUME="yes"
fi
if [ "$DOSUBVOLUME" = "yes" ]; then if [ "$DOSUBVOLUME" = "yes" ]; then
while [ "${BTRFS_SUBVOLUME}" = "" ]; do while [ "${BTRFS_SUBVOLUME}" = "" ]; do
DIALOG --inputbox "Enter the SUBVOLUME name for the device, keep it short\nand use no spaces or special\ncharacters." 10 65 2>$ANSWER || return 1 DIALOG --inputbox "Enter the SUBVOLUME name for the device, keep it short\nand use no spaces or special\ncharacters." 10 65 2>$ANSWER || return 1
@ -1998,13 +2010,20 @@ create_btrfs_subvolume() {
} }
# find btrfs subvolume # find btrfs subvolume
find_btrfs_subvolume(){ find_btrfs_subvolume() {
mount_btrfs if [ "$DETECT_CREATE_FILESYSTEM" = "no" ]; then
for i in $(btrfs subvolume list $BTRFSMP | cut -d " " -f 7); do # existing btrfs subvolumes
echo $i mount_btrfs
for i in $(btrfs subvolume list $BTRFSMP | cut -d " " -f 7); do
echo $i
[ "$1" ] && echo $1
done
umount_btrfs
else
# use the one from /tmp/.parts
echo $SUBVOLUME
[ "$1" ] && echo $1 [ "$1" ] && echo $1
done fi
umount_btrfs
} }
choose_btrfs_subvolume () { choose_btrfs_subvolume () {
@ -2046,7 +2065,6 @@ btrfs_subvolume() {
if [ $ASK_MOUNTPOINTS = "1" ]; then if [ $ASK_MOUNTPOINTS = "1" ]; then
# create subvolume if requested # create subvolume if requested
# choose btrfs subvolume if present # choose btrfs subvolume if present
### TODO: This fails if nothing is created yet!
if ! [ "$(find_btrfs_subvolume)" = "" ]; then if ! [ "$(find_btrfs_subvolume)" = "" ]; then
prepare_btrfs_subvolume || return 1 prepare_btrfs_subvolume || return 1
fi fi
@ -2102,15 +2120,21 @@ create_filesystem() {
FILESYSTEM_FINISH="yes" FILESYSTEM_FINISH="yes"
} }
# do not ask for filesystem creation, if already prepared for creation! # do not ask for btrfs filesystem creation, if already prepared for creation!
### TODO: not 100% safe! $PART must be more exact! check_btrfs_filesystem_creation() {
check_filesystem_creation() { DETECT_CREATE_FILESYSTEM="no"
SKIP_CREATE_FILESYSTEM="no" SKIP_FILESYSTEM="no"
for i in $(grep $PART /tmp/.parts); do SKIP_ASK_SUBVOLUME="no"
if [ "$(echo $i | grep ":btrfs:")" ]; then for i in $(grep $PART[:#] /tmp/.parts); do
SKIP_CREATE_FILESYSTEM="yes" if [ "$(echo $i | grep ":btrfs:")" -a "$(echo $i | cut -d: -f 4 | grep yes)" ]; then
break FSTYPE="btrfs"
SUBVOLUME="$SUBVOLUME#$(echo $i | cut -d: -f 9)"
DETECT_CREATE_FILESYSTEM="yes"
fi fi
if [ "$(echo $i | grep ":btrfs:")" ]; then
SKIP_FILESYSTEM="yes"
fi
[ "$DETECT_CREATE_FILESYSTEM" = "yes" ] && SKIP_ASK_SUBVOLUME="yes"
done done
} }
@ -2167,8 +2191,8 @@ mountpoints() {
# Select root filesystem type # Select root filesystem type
FSTYPE="$(blkid -c=/dev/null -o value -s TYPE $PART)" FSTYPE="$(blkid -c=/dev/null -o value -s TYPE $PART)"
DOMKFS="no" DOMKFS="no"
check_filesystem_creation check_btrfs_filesystem_creation
if [ "$ASK_MOUNTPOINTS" = "1" -a "$SKIP_CREATE_FILESYSTEM" = "no" ]; then if [ "$ASK_MOUNTPOINTS" = "1" -a "$SKIP_FILESYSTEM" = "no" ]; then
select_filesystem && create_filesystem && btrfs_subvolume select_filesystem && create_filesystem && btrfs_subvolume
else else
btrfs_subvolume btrfs_subvolume
@ -2190,9 +2214,9 @@ mountpoints() {
if [ "$PART" != "DONE" ]; then if [ "$PART" != "DONE" ]; then
FSTYPE="$(blkid -c=/dev/null -o value -s TYPE $PART)" FSTYPE="$(blkid -c=/dev/null -o value -s TYPE $PART)"
DOMKFS="no" DOMKFS="no"
check_filesystem_creation check_btrfs_filesystem_creation
# Select a filesystem type # Select a filesystem type
if [ "$ASK_MOUNTPOINTS" = "1" -a "$SKIP_CREATE_FILESYSTEM" = "no" ]; then if [ "$ASK_MOUNTPOINTS" = "1" -a "$SKIP_FILESYSTEM" = "no" ]; then
enter_mountpoint && select_filesystem && create_filesystem && btrfs_subvolume enter_mountpoint && select_filesystem && create_filesystem && btrfs_subvolume
else else
enter_mountpoint enter_mountpoint