diff options
| author | xengineering <mail2xengineering@protonmail.com> | 2020-01-09 10:52:52 +0100 |
|---|---|---|
| committer | xengineering <mail2xengineering@protonmail.com> | 2020-01-09 10:52:52 +0100 |
| commit | 3839b0df19ed779f19defa7bb113c4930e15b745 (patch) | |
| tree | 4f5c75dcc52336237fc3f728c332c5f1d52b8904 /stages | |
| parent | cd5cf703c4ef5f99787f407b122738e087fbfc36 (diff) | |
| parent | 457c01bfcd6346b8a06420d721fa02a216cea9bf (diff) | |
| download | archinstall-3839b0df19ed779f19defa7bb113c4930e15b745.tar archinstall-3839b0df19ed779f19defa7bb113c4930e15b745.tar.zst archinstall-3839b0df19ed779f19defa7bb113c4930e15b745.zip | |
Merge branch 'feature_luks' into devel
Diffstat (limited to 'stages')
| -rw-r--r-- | stages/first_stage.sh | 32 | ||||
| -rw-r--r-- | stages/second_stage.sh | 4 |
2 files changed, 30 insertions, 6 deletions
diff --git a/stages/first_stage.sh b/stages/first_stage.sh index 8b9d640..a3b7c03 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -32,11 +32,13 @@ 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 boot_partition_path="${disk_path}2" +export main_partition_path="${disk_path}3" 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") +export system_encryption=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "system_encryption") bash confirm_installation.sh $disk @@ -45,9 +47,23 @@ bash check_bootmode.sh bash partition_disk.sh $disk_path -bash create_filesystems.sh $boot_partition_path $root_partition_path +if [ $system_encryption == "yes" ];then -bash mount_filesystems.sh $root_partition_path + bash format_crypto_partition.sh $main_partition_path $DEFAULT_PASSWORD + + bash open_crypto_partition.sh $main_partition_path $DEFAULT_PASSWORD + + export root_partition_path="/dev/mapper/main" + +else + + export root_partition_path=$main_partition_path + +fi + +bash create_filesystems.sh $efi_partition_path $boot_partition_path $root_partition_path + +bash mount_filesystems.sh $boot_partition_path $root_partition_path bash install_packages.sh $desktop @@ -59,6 +75,12 @@ 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 $boot_partition_path $root_partition_path + +if [ $system_encryption == "yes" ];then + + bash close_crypto_partition.sh $main_partition_path + +fi bash print_final_message.sh $DEFAULT_PASSWORD diff --git a/stages/second_stage.sh b/stages/second_stage.sh index 7020b6b..c2c0b92 100644 --- a/stages/second_stage.sh +++ b/stages/second_stage.sh @@ -29,8 +29,10 @@ bash configure_timezone.sh /usr/share/zoneinfo/Europe/Berlin bash configure_network.sh $hostname +bash configure_initramfs.sh + bash configure_users.sh $admin_username $DEFAULT_PASSWORD -bash install_bootloader.sh $boot_partition_path +bash install_bootloader.sh $efi_partition_path $system_encryption $main_partition_path bash configure_desktop.sh |