summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/libs/lib-blockdevices-filesystems.sh2
-rw-r--r--src/core/libs/lib-ui-interactive.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index f8d6e6c..d701105 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -198,7 +198,7 @@ getlabel()
# $1 set to 1 to echo a newline after partition instead of a space (optional)
# $2 extra things to echo for each partition (optional)
# $3 something to append directly after the partition (optional) TODO: refactor code so there's a space in between, merge $2 and $3. use echo -e to print whatever user wants
-findpartitions() {
+findblockdevices() {
workdir="$PWD"
for devpath in $(finddisks)
do
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 4ad87ee..5a3b848 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -599,7 +599,7 @@ interactive_filesystems() {
renew_blockdevices=0
fi
fi
- [ "$renew_blockdevices" = 1 ] && findpartitions 0 'no_fs' ' raw no_label' > $TMP_BLOCKDEVICES
+ [ "$renew_blockdevices" = 1 ] && findblockdevices 0 'no_fs' ' raw no_label' > $TMP_BLOCKDEVICES
[ -z "$PART_ACCESS" ] && PART_ACCESS=dev
ask_option $PART_ACCESS 'Partition Access Method' 'How do you want your partitions to be accessed in grubs menu.lst and /etc/fstab?' '' \
@@ -929,7 +929,7 @@ interactive_grub() {
interactive_grub_menulst
DEVS=$(finddisks 1 _)
- DEVS="$DEVS $(findpartitions 1 _)"
+ DEVS="$DEVS $(findblockdevices 1 _)"
if [ "$DEVS" = " " ]; then
notify "No hard drives were found"
return 1