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

more btrfs fixes

Browse source
This commit is contained in:
Tobias Powalowski 2014-04-11 19:52:30 +02:00
parent 08edf83808
commit dc89666ae5
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1949,13 +1949,17 @@ btrfs_compress() {
fi fi
} }
# values that are only needed for btrfs creation # values that are needed for fs creation
clear_btrfs_values() { clear_fs_values() {
: >/tmp/.btrfs-devices : >/tmp/.btrfs-devices
DOMKFS="no"
LABEL_NAME="" LABEL_NAME=""
FS_OPTIONS="" FS_OPTIONS=""
BTRFS_DEVICES="" BTRFS_DEVICES=""
BTRFS_LEVEL="" BTRFS_LEVEL=""
BTRFS_SUBVOLUME=""
DOSUBVOLUME=""
BTRFS_COMPRESS=""
} }
# do not ask for btrfs filesystem creation, if already prepared for creation! # do not ask for btrfs filesystem creation, if already prepared for creation!
@ -2261,7 +2265,7 @@ mountpoints() {
DIALOG --menu "Select the partition to use as swap" 21 50 13 NONE - ${PARTS} 2>${ANSWER} || return 1 DIALOG --menu "Select the partition to use as swap" 21 50 13 NONE - ${PARTS} 2>${ANSWER} || return 1
PART=$(cat ${ANSWER}) PART=$(cat ${ANSWER})
if [[ "${PART}" != "NONE" ]]; then if [[ "${PART}" != "NONE" ]]; then
DOMKFS="no" clear_fs_values
if [[ "${ASK_MOUNTPOINTS}" = "1" ]]; then if [[ "${ASK_MOUNTPOINTS}" = "1" ]]; then
create_filesystem create_filesystem
else else
@ -2284,9 +2288,8 @@ mountpoints() {
PART_ROOT=${PART} PART_ROOT=${PART}
# Select root filesystem type # Select root filesystem type
FSTYPE="$(${_LSBLK} FSTYPE ${PART})" FSTYPE="$(${_LSBLK} FSTYPE ${PART})"
DOMKFS="no"
# clear values first! # clear values first!
clear_btrfs_values clear_fs_values
check_btrfs_filesystem_creation check_btrfs_filesystem_creation
if [[ "${ASK_MOUNTPOINTS}" = "1" && "${SKIP_FILESYSTEM}" = "no" ]]; then if [[ "${ASK_MOUNTPOINTS}" = "1" && "${SKIP_FILESYSTEM}" = "no" ]]; then
select_filesystem && create_filesystem && btrfs_subvolume select_filesystem && create_filesystem && btrfs_subvolume
@ -2310,9 +2313,8 @@ mountpoints() {
PART=$(cat ${ANSWER}) PART=$(cat ${ANSWER})
if [[ "${PART}" != "DONE" ]]; then if [[ "${PART}" != "DONE" ]]; then
FSTYPE="$(${_LSBLK} FSTYPE ${PART})" FSTYPE="$(${_LSBLK} FSTYPE ${PART})"
DOMKFS="no"
# clear values first! # clear values first!
clear_btrfs_values clear_fs_values
check_btrfs_filesystem_creation check_btrfs_filesystem_creation
# Select a filesystem type # Select a filesystem type
if [[ "${ASK_MOUNTPOINTS}" = "1" && "${SKIP_FILESYSTEM}" = "no" ]]; then if [[ "${ASK_MOUNTPOINTS}" = "1" && "${SKIP_FILESYSTEM}" = "no" ]]; then
@ -2532,6 +2534,7 @@ _mkfs() {
# swap: 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f # swap: 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f
# /home: 933ac7e1-2eb4-4f13-b844-0e14e2aef915 # /home: 933ac7e1-2eb4-4f13-b844-0e14e2aef915
# Complex devices, like mdadm, encrypt or lvm are not supported # Complex devices, like mdadm, encrypt or lvm are not supported
# btrfs on subvolumes is not supported!
# _GUID_VALUE: # _GUID_VALUE:
# get real device name from lsblk first to get GUID_VALUE from blkid # get real device name from lsblk first to get GUID_VALUE from blkid
_GUID_VALUE="$(${_BLKID} -p -i -s PART_ENTRY_TYPE -o value $(${_LSBLK} NAME,UUID,LABEL,PARTLABEL,PARTUUID | grep $(echo ${_device} | cut -d"=" -f2) | cut -d" " -f 1))" _GUID_VALUE="$(${_BLKID} -p -i -s PART_ENTRY_TYPE -o value $(${_LSBLK} NAME,UUID,LABEL,PARTLABEL,PARTUUID | grep $(echo ${_device} | cut -d"=" -f2) | cut -d" " -f 1))"