spacebar/macos-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve log messages of module 02

Browse Source
This commit is contained in:
Rezart Qelibari
2022-03-14 04:14:08 +01:00
parent 3289d2fbbf
commit 547683b980
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/02-create-filevault-user.sh
View File

@@ -84,13 +84,14 @@ function doesFileVaultUserExist() {
function _createFileVaultUser() {
local un=${filevault_username} fn=${filevault_fullname} pw=${filevault_password}
lop -n -- -d 'Creating FileVault user' -d "${un}" -d '...'
lop -- -d 'Creating FileVault user' -d "${un}"
sysadminctl -addUser "${un}" -fullName "${fn}" -shell /usr/bin/false -home '/var/empty' -password "${pw}" > /dev/null 2>&1
lop -- -d done
lop -- -d 'Return value of sysadminctl is ' -d "$?"
return 0
}
function createFileVaultUser() {
indicateActivity -- _createFileVaultUser "Creating FileVault user ${filevault_username}"
indicateActivity -- _createFileVaultUser "Creating FileVault user ${filevault_username}"
}
function _configureFileVaultUser() {
@@ -147,7 +148,9 @@ function _allowOrEnableDiskUnlock() {
}
function allowOrEnableDiskUnlock() {
indicateActivity -- _allowOrEnableDiskUnlock,$1,$2 "Allow ${1} to unlock disk"
local un="${1}" pw="${2}" action='Activate FileVault and allow'
fdesetup isactive >&! /dev/null && action='Allow'
indicateActivity -- _allowOrEnableDiskUnlock,$un,$pw "${action} ${un} to unlock disk"
}
function _allowOnlyFileVaultUserToUnlock() {
@@ -156,6 +159,7 @@ function _allowOnlyFileVaultUserToUnlock() {
for fdeuser in ${(f)"$(fdesetup list | cut -d',' -f1)"}; do
[ "${fdeuser}" != "${username}" ] && fdesetup remove -user "${fdeuser}"
done
return 0
}
function allowOnlyFileVaultUserToUnlock() {