Some improvement for encrypted formatting.

6 files changed, 39 insertions, 1 deletions

diff --git a/stages/first_stage.sh b/stages/first_stage.sh
index 9520894..ea11fa4 100644
--- a/stages/first_stage.sh
+++ b/stages/first_stage.sh
@@ -79,4 +79,10 @@ bash copy_archinstall_log.sh $LOG_FILE_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 5ad7745..34c4a49 100644
--- a/stages/second_stage.sh
+++ b/stages/second_stage.sh
@@ -29,6 +29,8 @@ bash configure_timezone.sh /usr/share/zoneinfo/Europe/Berlin
 
 bash configure_network.sh $hostname
 
+bash recreate_initramfs.sh
+
 bash configure_users.sh $admin_username $DEFAULT_PASSWORD
 
 bash install_bootloader.sh $efi_partition_path
diff --git a/util/close_crypto_partition.sh b/util/close_crypto_partition.sh
new file mode 100644
index 0000000..52bc50f
--- /dev/null
+++ b/util/close_crypto_partition.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+
+#  archinstall - A minimal Installation Script for Arch Linux
+#  Copyright (C) 2019  xengineering
+
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+
+main_partition_path=$1
+
+
+cryptsetup close $main_partition_path
+
+echo "Closed crypto partition - OK"
diff --git a/util/create_filesystems.sh b/util/create_filesystems.sh
index 41ed84a..972eefd 100644
--- a/util/create_filesystems.sh
+++ b/util/create_filesystems.sh
@@ -28,6 +28,6 @@ fatlabel $efi_partition_path "EFI"
 mkfs.ext4 $boot_partition_path
 e2label $boot_partition_path "BOOT"
 mkfs.ext4 $root_partition_path
-e2label $root_partition_path "MAIN"
+e2label $root_partition_path "ROOT"
 
 echo "Created filesystems - OK"
diff --git a/util/format_crypto_partition.sh b/util/format_crypto_partition.sh
index 97cdad4..688e280 100644
--- a/util/format_crypto_partition.sh
+++ b/util/format_crypto_partition.sh
@@ -23,3 +23,5 @@ DEFAULT_PASSWORD=$2
 
 
 echo -n "$DEFAULT_PASSWORD" | cryptsetup luksFormat $main_partition_path -
+
+echo "Formatted crypto partition - OK"
diff --git a/util/open_crypto_partition.sh b/util/open_crypto_partition.sh
index 2a01c55..40e7a61 100644
--- a/util/open_crypto_partition.sh
+++ b/util/open_crypto_partition.sh
@@ -23,3 +23,5 @@ DEFAULT_PASSWORD=$2
 
 
 echo -n "$DEFAULT_PASSWORD" | cryptsetup open $main_partition_path main -
+
+echo "Opened crypto partition - OK"