diff options
| author | xengineering <mail2xengineering@protonmail.com> | 2019-12-17 13:47:27 +0100 |
|---|---|---|
| committer | xengineering <mail2xengineering@protonmail.com> | 2019-12-17 13:47:27 +0100 |
| commit | f5d7884eb22ab15a5a5c7a70cfcecec8cce360b8 (patch) | |
| tree | 5d33368fd22d47f459b09ae4abc525e1b72a1d88 | |
| parent | 00f3ae82ac392fe0ec85d6fc8734a14df80072f8 (diff) | |
| download | archinstall-f5d7884eb22ab15a5a5c7a70cfcecec8cce360b8.tar archinstall-f5d7884eb22ab15a5a5c7a70cfcecec8cce360b8.tar.zst archinstall-f5d7884eb22ab15a5a5c7a70cfcecec8cce360b8.zip | |
Renamed boot_partition to efi_partition and root_partition to main_partition.
| -rw-r--r-- | stages/first_stage.sh | 10 | ||||
| -rw-r--r-- | stages/second_stage.sh | 2 | ||||
| -rw-r--r-- | util/create_filesystems.sh | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/stages/first_stage.sh b/stages/first_stage.sh index 8b9d640..a491067 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -32,8 +32,8 @@ python $REPOSITORY_PATH/util/write_config.py $CONFIG_FILE_PATH export disk=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "disk") export disk_path=/dev/$disk -export boot_partition_path="${disk_path}1" -export root_partition_path="${disk_path}2" +export efi_partition_path="${disk_path}1" +export main_partition_path="${disk_path}2" export hostname=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "hostname") export desktop=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "desktop") export admin_username=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "admin_username") @@ -45,9 +45,9 @@ bash check_bootmode.sh bash partition_disk.sh $disk_path -bash create_filesystems.sh $boot_partition_path $root_partition_path +bash create_filesystems.sh $efi_partition_path $main_partition_path -bash mount_filesystems.sh $root_partition_path +bash mount_filesystems.sh $main_partition_path bash install_packages.sh $desktop @@ -59,6 +59,6 @@ echo "bash second_stage.sh" | arch-chroot /mnt bash copy_archinstall_log.sh $LOG_FILE_PATH -bash unmount_filesystems.sh $root_partition_path +bash unmount_filesystems.sh $main_partition_path bash print_final_message.sh $DEFAULT_PASSWORD diff --git a/stages/second_stage.sh b/stages/second_stage.sh index 7020b6b..5ad7745 100644 --- a/stages/second_stage.sh +++ b/stages/second_stage.sh @@ -31,6 +31,6 @@ bash configure_network.sh $hostname bash configure_users.sh $admin_username $DEFAULT_PASSWORD -bash install_bootloader.sh $boot_partition_path +bash install_bootloader.sh $efi_partition_path bash configure_desktop.sh diff --git a/util/create_filesystems.sh b/util/create_filesystems.sh index 8f2341f..f3b06f1 100644 --- a/util/create_filesystems.sh +++ b/util/create_filesystems.sh @@ -18,13 +18,13 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. -boot_partition_path=$1 # e.g. /dev/sda1 -root_partition_path=$2 # e.g. /dev/sda2 +efi_partition_path=$1 # e.g. /dev/sda1 +main_partition_path=$2 # e.g. /dev/sda2 -mkfs.fat -F32 $boot_partition_path -fatlabel $boot_partition_path "BOOT" -mkfs.ext4 $root_partition_path -e2label $root_partition_path "ROOT" +mkfs.fat -F32 $efi_partition_path +fatlabel $efi_partition_path "EFI" +mkfs.ext4 $main_partition_path +e2label $main_partition_path "ROOT" echo "Created filesystems - OK" |