Skip to content

Fix: Handle CRLF in syslinux and grub configs #2613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
limetech merged 1 commit into from
Apr 22, 2026
+14 −9
Merged

Fix: Handle CRLF in syslinux and grub configs #2613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions emhttp/plugins/dynamix/scripts/manage_boot_params.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ parse_append_line() {

# Extract append line for specific label
# Matches from "label $label" to the next "label" or end of file
awk -v label="$label" '
# Normalize CRLF to LF for parsing (DOS-edited syslinux.cfg)
tr -d '\r' < "$cfg_file" | awk -v label="$label" '
BEGIN { label=tolower(label) }
/^label / {
line=tolower($0)
Expand All @@ -278,7 +279,7 @@ parse_append_line() {
print
exit
}
' "$cfg_file"
'
}

#############################################
Expand All @@ -288,7 +289,8 @@ parse_grub_linux_args() {
local label="$1"
local cfg_file="${2:-$GRUB_CFG}"

awk -v label="$label" '
# Normalize CRLF to LF for parsing (DOS-edited grub.cfg)
tr -d '\r' < "$cfg_file" | awk -v label="$label" '
$0 ~ /^menuentry / {
in_section = (index($0, "\"" label "\"") > 0 || index($0, "\x27" label "\x27") > 0)
}
Expand All @@ -303,7 +305,7 @@ parse_grub_linux_args() {
}
exit
}
' "$cfg_file"
'
}

#############################################
Expand Down Expand Up @@ -349,7 +351,7 @@ extract_grub_timeout() {
local cfg_file="${1:-$GRUB_CFG}"

if [[ -f "$cfg_file" ]]; then
grep "^set timeout=" "$cfg_file" | awk -F'=' '{print $2}' | tr -d '\r' | head -n 1
tr -d '\r' < "$cfg_file" | grep "^set timeout=" | awk -F'=' '{print $2}' | head -n 1
else
echo ""
fi
Expand Down Expand Up @@ -748,16 +750,16 @@ validate_config() {
return 1
fi

# Check required labels exist
if ! grep -qi "^label unraid OS$" "$cfg_file"; then
# Check required labels exist (strip CR so ^/$ match CRLF files)
if ! tr -d '\r' < "$cfg_file" | grep -qi "^label unraid OS$"; then
return 1
fi

if ! grep -qi "^label unraid OS GUI Mode$" "$cfg_file"; then
if ! tr -d '\r' < "$cfg_file" | grep -qi "^label unraid OS GUI Mode$"; then
return 1
fi

if ! grep -qi "^label unraid OS Safe Mode" "$cfg_file"; then
if ! tr -d '\r' < "$cfg_file" | grep -qi "^label unraid OS Safe Mode"; then
return 1
fi

Expand Down Expand Up @@ -1098,6 +1100,9 @@ write_config_grub() {

local temp_file=$(mktemp -p "$(dirname "$GRUB_CFG")")
cp "$GRUB_CFG" "$temp_file"
# Strip CR from CRLF so awk/grep/sed in update_grub_* match Unix line endings
local temp_lf="${temp_file}.lf"
tr -d '\r' < "$temp_file" > "$temp_lf" && mv "$temp_lf" "$temp_file"

if [[ "${APPLY_TO_UNRAID_OS}" == "1" ]]; then
update_grub_entry "Unraid OS" "$new_args" "$temp_file"
Expand Down
Loading