From 2c5994e359da4299ffb0a9e7f3f338002677a904 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 5 Dec 2010 19:49:56 +0100 Subject: code cleanup: use bash4 associative arrays for filesystem stuff now the information about which setup programs for filesystems, label programs, which FS'es can go on which blockdevices, need/can have labels, can be mounted and FS friendly names are in a central place in libs/lib-blockdevices-filesystems.sh. This simplifies the code somewhat where you actually want to work with the filesystems. Also, we only check the available filesystem utilities once at program startup, causing a performance improvement. --- src/core/procedures/automatic | 1 + src/core/procedures/base | 1 + src/core/procedures/interactive | 1 + 3 files changed, 3 insertions(+) (limited to 'src/core/procedures') diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic index 596aed3..6fdc1d8 100644 --- a/src/core/procedures/automatic +++ b/src/core/procedures/automatic @@ -82,6 +82,7 @@ worker_runtime_network () worker_prepare_disks () { + get_possible_fs echo "$var_PARTITIONS" > $TMP_PARTITIONS echo "$var_BLOCKDATA" > $TMP_BLOCKDEVICES process_disks || die_error "Could not process_disks" diff --git a/src/core/procedures/base b/src/core/procedures/base index f357908..98a816b 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -139,6 +139,7 @@ worker_interactive_time () worker_prepare_disks () { partition # use lib-archboot function by default + get_possible_fs # in official installer: autoprepare or diy first partitions, then mountpoints } diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index b64101b..5673347 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -101,6 +101,7 @@ worker_configure_system() worker_prepare_disks() { + get_possible_fs interactive_prepare_disks } -- cgit v1.2.3-54-g00ecf