summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxengineering <mail2xengineering@protonmail.com>2019-12-22 20:51:57 +0100
committerxengineering <mail2xengineering@protonmail.com>2019-12-22 20:51:57 +0100
commit9ccbdf11c564bae4cddd449e0342516b008be49b (patch)
tree97ad25f289ab71b53145277cfc57f073ac760517
parent9050875a8d36640d7068afd6b6632a97104d8df4 (diff)
downloadarchinstall-9ccbdf11c564bae4cddd449e0342516b008be49b.tar
archinstall-9ccbdf11c564bae4cddd449e0342516b008be49b.tar.zst
archinstall-9ccbdf11c564bae4cddd449e0342516b008be49b.zip
Removed LVM on top of LUKS for a MVP-style version of encryption.
-rw-r--r--stages/first_stage.sh4
-rw-r--r--util/setup_lvm.sh23
2 files changed, 1 insertions, 26 deletions
diff --git a/stages/first_stage.sh b/stages/first_stage.sh
index ea11fa4..a3b7c03 100644
--- a/stages/first_stage.sh
+++ b/stages/first_stage.sh
@@ -53,9 +53,7 @@ if [ $system_encryption == "yes" ];then
bash open_crypto_partition.sh $main_partition_path $DEFAULT_PASSWORD
- bash setup_lvm.sh
-
- export root_partition_path="/dev/SystemVolumeGroup/root"
+ export root_partition_path="/dev/mapper/main"
else
diff --git a/util/setup_lvm.sh b/util/setup_lvm.sh
deleted file mode 100644
index ac6f5fe..0000000
--- a/util/setup_lvm.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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/>.
-
-
-pvcreate /dev/mapper/main
-vgcreate SystemVolumeGroup /dev/mapper/main
-lvcreate -l 100%FREE SystemVolumeGroup -n root