From f5d7884eb22ab15a5a5c7a70cfcecec8cce360b8 Mon Sep 17 00:00:00 2001 From: xengineering Date: Tue, 17 Dec 2019 13:47:27 +0100 Subject: Renamed boot_partition to efi_partition and root_partition to main_partition. --- util/create_filesystems.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'util/create_filesystems.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 . -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" -- cgit v1.2.3-70-g09d2 From 764beecf0429e2c89ea1a8bc87681e56a9ce2f82 Mon Sep 17 00:00:00 2001 From: xengineering Date: Wed, 18 Dec 2019 17:05:02 +0100 Subject: Renamed label of main partition to "MAIN". --- util/create_filesystems.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/create_filesystems.sh') diff --git a/util/create_filesystems.sh b/util/create_filesystems.sh index f3b06f1..58d67bb 100644 --- a/util/create_filesystems.sh +++ b/util/create_filesystems.sh @@ -25,6 +25,6 @@ main_partition_path=$2 # e.g. /dev/sda2 mkfs.fat -F32 $efi_partition_path fatlabel $efi_partition_path "EFI" mkfs.ext4 $main_partition_path -e2label $main_partition_path "ROOT" +e2label $main_partition_path "MAIN" echo "Created filesystems - OK" -- cgit v1.2.3-70-g09d2 From b26983b4e967957f5ecc32d75663a723f97c2588 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sun, 22 Dec 2019 15:20:25 +0100 Subject: Reimplemented some modules for luks encryption. --- stages/first_stage.sh | 12 ++++++++---- util/create_filesystems.sh | 9 ++++++--- util/install_bootloader.sh | 6 +++--- util/mount_filesystems.sh | 5 ++++- util/unmount_filesystems.sh | 7 +++++-- 5 files changed, 26 insertions(+), 13 deletions(-) (limited to 'util/create_filesystems.sh') diff --git a/stages/first_stage.sh b/stages/first_stage.sh index b268353..9520894 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -55,13 +55,17 @@ if [ $system_encryption == "yes" ];then bash setup_lvm.sh - export main_partition_path="/dev/SystemVolumeGroup/root" + export root_partition_path="/dev/SystemVolumeGroup/root" + +else + + export root_partition_path=$main_partition_path fi -bash create_filesystems.sh $efi_partition_path $main_partition_path +bash create_filesystems.sh $efi_partition_path $boot_partition_path $root_partition_path -bash mount_filesystems.sh $main_partition_path +bash mount_filesystems.sh $boot_partition_path $root_partition_path bash install_packages.sh $desktop @@ -73,6 +77,6 @@ echo "bash second_stage.sh" | arch-chroot /mnt bash copy_archinstall_log.sh $LOG_FILE_PATH -bash unmount_filesystems.sh $main_partition_path +bash unmount_filesystems.sh $boot_partition_path $root_partition_path bash print_final_message.sh $DEFAULT_PASSWORD diff --git a/util/create_filesystems.sh b/util/create_filesystems.sh index 58d67bb..41ed84a 100644 --- a/util/create_filesystems.sh +++ b/util/create_filesystems.sh @@ -19,12 +19,15 @@ efi_partition_path=$1 # e.g. /dev/sda1 -main_partition_path=$2 # e.g. /dev/sda2 +boot_partition_path=$2 # e.g. /dev/sda2 +root_partition_path=$3 # e.g. /dev/sda3 or /dev/SystemVolumeGroup/root mkfs.fat -F32 $efi_partition_path fatlabel $efi_partition_path "EFI" -mkfs.ext4 $main_partition_path -e2label $main_partition_path "MAIN" +mkfs.ext4 $boot_partition_path +e2label $boot_partition_path "BOOT" +mkfs.ext4 $root_partition_path +e2label $root_partition_path "MAIN" echo "Created filesystems - OK" diff --git a/util/install_bootloader.sh b/util/install_bootloader.sh index 29e211f..cf6c374 100644 --- a/util/install_bootloader.sh +++ b/util/install_bootloader.sh @@ -18,13 +18,13 @@ # along with this program. If not, see . -boot_partition_path=$1 +efi_partition_path=$1 -mount $boot_partition_path /mnt +mount $efi_partition_path /mnt grub-install --target=x86_64-efi --efi-directory=/mnt --bootloader-id=GRUB \ --removable grub-mkconfig -o /boot/grub/grub.cfg -umount $boot_partition_path +umount $efi_partition_path echo "Installed bootloader - OK" diff --git a/util/mount_filesystems.sh b/util/mount_filesystems.sh index 4bb66e4..f24421b 100644 --- a/util/mount_filesystems.sh +++ b/util/mount_filesystems.sh @@ -18,9 +18,12 @@ # along with this program. If not, see . -root_partition_path=$1 # e.g. /dev/sda2 +boot_partition_path=$1 +root_partition_path=$2 mount $root_partition_path /mnt +mkdir /mnt/boot +mount $boot_partition_path /mnt/boot echo "Mounted filesystems - OK" diff --git a/util/unmount_filesystems.sh b/util/unmount_filesystems.sh index 770a5e7..6ccce3b 100644 --- a/util/unmount_filesystems.sh +++ b/util/unmount_filesystems.sh @@ -18,9 +18,12 @@ # along with this program. If not, see . -root_partition_path=$1 # e.g. /dev/sda2 +boot_partition_path=$1 +root_partition_path=$2 -cd /root && umount $root_partition_path +cd /root +umount $boot_partition_path +umount $root_partition_path echo "Unmounted filesystems - OK" -- cgit v1.2.3-70-g09d2 From 9050875a8d36640d7068afd6b6632a97104d8df4 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sun, 22 Dec 2019 20:15:03 +0100 Subject: Some improvement for encrypted formatting. --- stages/first_stage.sh | 6 ++++++ stages/second_stage.sh | 2 ++ util/close_crypto_partition.sh | 26 ++++++++++++++++++++++++++ util/create_filesystems.sh | 2 +- util/format_crypto_partition.sh | 2 ++ util/open_crypto_partition.sh | 2 ++ 6 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 util/close_crypto_partition.sh (limited to 'util/create_filesystems.sh') 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 . + + +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" -- cgit v1.2.3-70-g09d2