Mirror/arch
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/arch synced 2024-12-23 01:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Daniel Langbein 2021-06-22 17:13:52 +02:00
parent fdf3d5f622
commit 83cf31f6bc
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/de-p1st-installer/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=installer _pkgname=installer
_reponame=arch _reponame=arch
pkgname="de-p1st-$_pkgname" pkgname="de-p1st-$_pkgname"
pkgver=0.1.18 pkgver=0.1.19
pkgrel=1 pkgrel=1
pkgdesc="Bash script to install Arch Linux" pkgdesc="Bash script to install Arch Linux"
arch=('any') arch=('any')

6
pkg/de-p1st-installer/de-p1st-installer.sh
View File

@ -139,6 +139,7 @@ function get_user_input() {
if [ -z "${USER_PWD}" ]; then if [ -z "${USER_PWD}" ]; then
ask_user_if_empty USER_PWD 'Enter a user password:' || return $? ask_user_if_empty USER_PWD 'Enter a user password:' || return $?
ask_user_if_empty USER_PWD2 'Please enter the password again:' || return $? ask_user_if_empty USER_PWD2 'Please enter the password again:' || return $?
# shellcheck disable=SC2153
[[ "${USER_PWD}" == "${USER_PWD2}" ]] || { [[ "${USER_PWD}" == "${USER_PWD2}" ]] || {
echo 'Passwords did not match'; echo 'Passwords did not match';
exit 1; exit 1;
@ -147,6 +148,7 @@ function get_user_input() {
if [ -z "${LUKS_PWD}" ]; then if [ -z "${LUKS_PWD}" ]; then
ask_user_if_empty LUKS_PWD 'Enter a disk encryption password:' || return $? ask_user_if_empty LUKS_PWD 'Enter a disk encryption password:' || return $?
ask_user_if_empty LUKS_PWD2 'Please enter the password again:' || return $? ask_user_if_empty LUKS_PWD2 'Please enter the password again:' || return $?
# shellcheck disable=SC2153
[[ "${LUKS_PWD}" == "${LUKS_PWD2}" ]] || { [[ "${LUKS_PWD}" == "${LUKS_PWD2}" ]] || {
echo 'Passwords did not match'; echo 'Passwords did not match';
exit 1; exit 1;
@ -247,9 +249,9 @@ function mount_partitions() {
sudo umount -R /mnt || return $? sudo umount -R /mnt || return $?
echo 'Mounting @ and @home subvolumes with options: '"${FS_MOUNT_OPTIONS}" echo 'Mounting @ and @home subvolumes with options: '"${FS_MOUNT_OPTIONS}"
sudo mount -o 'subvol=@'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt || return $? sudo mount -o 'subvol=@,'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt || return $?
sudo mkdir /mnt/home || return $? sudo mkdir /mnt/home || return $?
sudo mount -o 'subvol=@home'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt/home || return $? sudo mount -o 'subvol=@home,'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt/home || return $?
;; ;;
*) *)
echo 'BTRFS subvolume layout '"${FS_BTRFS_SUBVOL_LAYOUT}"' not supported!' echo 'BTRFS subvolume layout '"${FS_BTRFS_SUBVOL_LAYOUT}"' not supported!'

2
pkg/de-p1st-installer/example-vbox.cfg
View File

@ -13,7 +13,7 @@ LUKS_PWD='test'
# If unset, then USER_PWD will be used for ROOT_PWD # If unset, then USER_PWD will be used for ROOT_PWD
# ROOT_PWD=test # ROOT_PWD=test
TARGET_BLOCK_DEVICE='/dev/sda' TARGET_BLOCK_DEVICE='/dev/sda' # /dev/vda for Virtual Machine Manager
BOOT_PART_SIZE='500' # MiB BOOT_PART_SIZE='500' # MiB
FS='BTRFS' FS='BTRFS'
FS_BTRFS_SUBVOL_LAYOUT='@root@home' # Subvolume layout that is supported by Timeshift FS_BTRFS_SUBVOL_LAYOUT='@root@home' # Subvolume layout that is supported by Timeshift