msw/CISS.debian.installer
SHA256
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m51s
Details

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-08-28 23:46:34 +02:00
parent f7db18ed28
commit a1346e245f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
func/cdi_4200_boot/4200_generate_fstab.sh
View File

@@ -29,9 +29,7 @@ write_fstab() {
declare write_maps="$1" write_path="$2" write_type="$3" write_opts="$4" write_pass="$5" declare write_maps="$1" write_path="$2" write_type="$3" write_opts="$4" write_pass="$5"
#if [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]]; then #if [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]]; then
if [[ "${write_maps}" =~ ^[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}$ ]] || \ if [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]]; then
[[ "${write_maps}" =~ ^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}$ ]] || \
[[ "${write_maps}" =~ ^[0-9A-Fa-f]{8}(-[0-9A-Fa-f]{4}){3}[0-9A-Fa-f]{12}$ ]]; then
printf "%-43s%-28s%-18s%-100s0 %s\n" "UUID=${write_maps}" "${write_path}" "${write_type}" "${write_opts}" "${write_pass}" >> "${TARGET}/etc/fstab" printf "%-43s%-28s%-18s%-100s0 %s\n" "UUID=${write_maps}" "${write_path}" "${write_type}" "${write_opts}" "${write_pass}" >> "${TARGET}/etc/fstab"
do_log "info" "file_only" "4200() fstab entry generated: [UUID=${write_maps} ${write_path} ${write_type} ${write_opts} 0 ${write_pass}]." do_log "info" "file_only" "4200() fstab entry generated: [UUID=${write_maps} ${write_path} ${write_type} ${write_opts} 0 ${write_pass}]."

4
func/cdi_4300_network/4300_installation_network.sh
View File

@@ -55,8 +55,8 @@ installation_network() {
echo ExitCode: \$? >> ${var_logfile} echo ExitCode: \$? >> ${var_logfile}
" "
echo "systemctl disable systemd-networkd NetworkManager" >> "${var_logfile}" echo "systemctl disable systemd-networkd NetworkManager" >> "${TARGET}${var_logfile}"
echo "systemctl disable dhcpcd.service" >> "${var_logfile}" echo "systemctl disable dhcpcd.service" >> "${TARGET}${var_logfile}"
chroot_script "${TARGET}" " chroot_script "${TARGET}" "
systemctl disable systemd-networkd NetworkManager 2>/dev/null | tee -a ${var_logfile} || true systemctl disable systemd-networkd NetworkManager 2>/dev/null | tee -a ${var_logfile} || true