obel1x/fedora-OEMDRV
0
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fedora 44, install/configure improvements, Nextcloud desktop client fixes #24

Merged
obel1x merged 27 commits from unbrot/fedora-OEMDRV:main into main 2026-05-04 17:00:04 +02:00
Conversation 0 Commits 27 Files Changed 19
+8 -6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f7dc9c043 - Show all commits
system_setup/configure.sh
+2 -2
View File
@@ -51,7 +51,7 @@ do_configure() {
echo "=== System Configuration ===" echo "=== System Configuration ==="
echo "Press Enter to keep the current value, or type a new one." echo "Press Enter to keep the current value, or type a new one."
source "$CONF_FILE" source "$( dirname "$0" )/setup_system.inc.sh"
VARS=("TLDOMAIN" "SERVERFQDN_IPA" "DOMAIN" "SERVERFQDN_NC" "IPAVAULTUSE" "IPAVAULTNAME" "DISTCONFIGPATH_SRC" "CLIENTADMINGROUP" ) VARS=("TLDOMAIN" "SERVERFQDN_IPA" "DOMAIN" "SERVERFQDN_NC" "IPAVAULTUSE" "IPAVAULTNAME" "DISTCONFIGPATH_SRC" "CLIENTADMINGROUP" )
for ELE in "${VARS[@]}" for ELE in "${VARS[@]}"
do do
@@ -59,7 +59,7 @@ do_configure() {
echo "" echo ""
new_ELE=$(prompt_value "${ELE}" "${!ELE}") new_ELE=$(prompt_value "${ELE}" "${!ELE}")
set_conf_var "${ELE}" "${new_ELE}" set_conf_var "${ELE}" "${new_ELE}"
source "$CONF_FILE" source "$( dirname "$0" )/setup_system.inc.sh"
REPEAT_TEST=1 REPEAT_TEST=1
case ${ELE} in case ${ELE} in
"SERVERFQDN_NC") echo "=== Testing: Nextcloud server ===" "SERVERFQDN_NC") echo "=== Testing: Nextcloud server ==="
system_setup/setup_system.inc.sh
+6 -4
View File
@@ -20,14 +20,16 @@ unset _inc_arg
#Get the machine_uuid wich is needed by some userspace programs. #Get the machine_uuid wich is needed by some userspace programs.
#As all Parameters that are bound to CPU or Mainboard, are only readable by root, we need to get the values at installtime. #As all Parameters that are bound to CPU or Mainboard, are only readable by root, we need to get the values at installtime.
#On old installations without the file, we will write it whenever possible #On old installations without the file, we will write it whenever possible
if [ -f $( dirname "${BASH_SOURCE[0]:-$0}" )/../config.d/machine_uuid.sys ]; then MACHINEID_FILE="$( dirname "${BASH_SOURCE[0]:-$0}" )/../config.d/machine_uuid.sys"
export MACHINEID="$( cat $( dirname "${BASH_SOURCE[0]:-$0}" )/../config.d/machine_uuid.sys )" if [ -f ${MACHINEID_FILE} ]; then
export MACHINEID="$( cat ${MACHINEID_FILE} )"
elif [ "$EUID" -eq 0 ]; then elif [ "$EUID" -eq 0 ]; then
dmidecode -t system | grep -i 'UUID' \ dmidecode -t system | grep -i 'UUID' \
| sed 's/UUID: //' | tr '[:upper:]' '[:lower:]' \ | sed 's/UUID: //' | tr '[:upper:]' '[:lower:]' \
| sed 's/[^0-9a-z]*//g' | xargs | tail -c 13 \ | sed 's/[^0-9a-z]*//g' | xargs | tail -c 13 \
> "$( dirname "${BASH_SOURCE[0]:-$0}" )/../config.d/machine_uuid.sys" > "${MACHINEID_FILE}"
export MACHINEID="$( cat $( dirname "${BASH_SOURCE[0]:-$0}" )/../config.d/machine_uuid.sys )" export MACHINEID="$( cat ${MACHINEID_FILE} )"
echo "Wrote MACHINEID ${MACHINEID} to ${MACHINEID_FILE}"
fi fi
#Check for configure.conf - used for first setup of system #Check for configure.conf - used for first setup of system