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

fix autoprepare function

Browse source
This commit is contained in:
Tobias Powalowski 2010-06-03 23:02:57 +02:00
parent 3659044446
commit b9425baa61
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1772,7 +1772,7 @@ autoprepare() {
DEVICE=$DISC DEVICE=$DISC
# default filesystem specs (the + is bootable flag) # default filesystem specs (the + is bootable flag)
# <mountpoint>:<partsize>:<fstype>[:+]:labelname # <mountpoint>:<partsize>:<fstype>[:+]:labelname
FSSPECS="/boot:$BOOT_PART_SIZE:ext2:+:BOOT_AUTOPREPARE swap:$SWAP_PART_SIZE:swap:SWAP_AUTOPREPARE /:$ROOT_PART_SIZE:$FSTYPE:ROOT_AUTOPREPARE /home:*:$FSTYPE:HOME_AUTOPREPARE" FSSPECS="/boot:$BOOT_PART_SIZE:ext2:+:BOOT_AUTOPREPARE swap:$SWAP_PART_SIZE:swap::SWAP_AUTOPREPARE /:$ROOT_PART_SIZE:$FSTYPE::ROOT_AUTOPREPARE /home:*:$FSTYPE::HOME_AUTOPREPARE"
sfdisk_input="" sfdisk_input=""
# validate DEVICE # validate DEVICE
@ -1863,6 +1863,7 @@ EOF
fstype=$(echo $fsspec | tr -d ' ' | cut -f3 -d:) fstype=$(echo $fsspec | tr -d ' ' | cut -f3 -d:)
labelname=$(echo $fsspec | tr -d ' ' | cut -f5 -d:) labelname=$(echo $fsspec | tr -d ' ' | cut -f5 -d:)
if echo $mountpoint | tr -d ' ' | grep '^/$' 2>&1 >/dev/null; then if echo $mountpoint | tr -d ' ' | grep '^/$' 2>&1 >/dev/null; then
DIALOG --infobox "Creating $fstype on ${DEVICE}${part}" 0 0
_mkfs yes ${DEVICE}${part} "$fstype" "$DESTDIR" "$mountpoint" "$labelname" || return 1 _mkfs yes ${DEVICE}${part} "$fstype" "$DESTDIR" "$mountpoint" "$labelname" || return 1
fi fi
part=$(($part + 1)) part=$(($part + 1))
@ -1876,6 +1877,7 @@ EOF
fstype=$(echo $fsspec | tr -d ' ' | cut -f3 -d:) fstype=$(echo $fsspec | tr -d ' ' | cut -f3 -d:)
labelname=$(echo $fsspec | tr -d ' ' | cut -f5 -d:) labelname=$(echo $fsspec | tr -d ' ' | cut -f5 -d:)
if [ $(echo $mountpoint | tr -d ' ' | grep '^/$' | wc -l) -eq 0 ]; then if [ $(echo $mountpoint | tr -d ' ' | grep '^/$' | wc -l) -eq 0 ]; then
DIALOG --infobox "Creating $fstype on ${DEVICE}${part}" 0 0
_mkfs yes ${DEVICE}${part} "$fstype" "$DESTDIR" "$mountpoint" "$labelname" || return 1 _mkfs yes ${DEVICE}${part} "$fstype" "$DESTDIR" "$mountpoint" "$labelname" || return 1
fi fi
part=$(($part + 1)) part=$(($part + 1))