Upgrade to latest main #11

Merged
obel1x merged 4 commits from main into devel 2026-04-25 15:47:49 +02:00
4 changed files with 16 additions and 5 deletions
Showing only changes of commit db62feea72 - Show all commits
+6 -4
View File
@@ -1,9 +1,11 @@
.Trash*
*.kdev4
.kdev4/*
client_software/.sync_*.db
client_software/setup_system.conf
config/setup_system.conf
config/setup_system.conf.bak
config/skel.tar.zst
config/.sync_*.db
client_software/.sync_*.db
client_software/setup_system.conf
*.kdev4
.kdev4/*
config/.sync_*.db
config.d/*.conf
+1 -1
View File
@@ -1,6 +1,6 @@
# Fedora OEMDRV
an automated massinstallation scripting collection for Fedora and Anakonda
an automated massinstallation scripting collection for Fedora and Anaconda
IN DEVELOPMENT !
+4
View File
@@ -0,0 +1,4 @@
# Local config Files
You may have .conf files in here, which will be not be touched by anything and will be sourced by the scripts to overwrite any of the settings in setup_system.conf.dist
The syntax should be same as setup_system.conf.dist
+5
View File
@@ -21,6 +21,11 @@ if [ ! -f $(dirname "$0")/../config/setup_system.conf ]; then
fi
source $(dirname "$0")/../config/setup_system.conf
#Parse additional client-configs
if [[ `ls -1 $(dirname "$0")/../config.d/*.conf 2>/dev/null | wc -l ` -gt 0 ]]; then
source $(dirname "$0")/../config.d/*.conf
fi
#Check if the Data- Directory is encrypted
check_data_isecrypted() {
CHECKRES=$( cat /etc/mtab | grep "${DECRYPTEDDATADIR}" | grep "fuse.gocryptfs" )