Skip to content

fix(linbo_sync): fall back to the plain group for windows boot files #181

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

Open
TomlDev wants to merge 2 commits into
base: 7.4
Choose a base branch
from
Open

fix(linbo_sync): fall back to the plain group for windows boot files #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4fabfb
fix(linbo_sync): fall back to the plain group for windows boot files
TomlDev Sep 28, 2026
9c550d9
Merge branch '7.4' into fix/linbo-sync-group-fallback
TomlDev Oct 7, 2026
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
27 changes: 20 additions & 7 deletions src/linbofs/usr/bin/linbo_sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,19 @@ set_guid(){
}


# group_bootfile path [suffix]
# prints path.$HOSTGROUP[suffix], a group keyed windows boot file stored in the
# image. Falls back to the plain group name (the part after "<school>+") if
# only that one exists, as in images created before hardware groups of
# non-default schools became school qualified (#178).
group_bootfile(){
local file="$1.$HOSTGROUP$2"
local plainfile="$1.${HOSTGROUP#*+}$2"
[ ! -e "$file" -a -e "$plainfile" ] && file="$plainfile"
echo "$file"
}


# patch fstab with root & efi partitions: patch_fstab rootdev
patch_fstab(){
echo -n "patch_fstab " ; printargs "$@"
Expand Down Expand Up @@ -397,11 +410,11 @@ syncl(){
local srcdir="$(ls -d /mnt/[Ww][Ii][Nn][Dd][Oo][Ww][Ss]/[Bb][Oo][Oo][Tt]/[Ee][Ff][Ii] 2> /dev/null)"
[ -n "$srcdir" ] && cp -r "$srcdir"/* "$bootdir/"
fi
bcd_backup="$bootdir"/BCD."$HOSTGROUP"."$partname"
bcd_backup="$(group_bootfile "$bootdir"/BCD ."$partname")"
else
# bios
bootdir="$(ls -d /mnt/[Bb][Oo][Oo][Tt])"
bcd_backup="$bootdir"/BCD."$HOSTGROUP"
bcd_backup="$(group_bootfile "$bootdir"/BCD)"
fi

# restore bcd
Expand All @@ -412,11 +425,11 @@ syncl(){

# restore disk boot sector
# detect old versions
local bsmbr="$bootdir"/bsmbr."$HOSTGROUP"
local bsmbr_old="$bootdir"/winmbr446."$HOSTGROUP"
local bsmbr="$(group_bootfile "$bootdir"/bsmbr)"
local bsmbr_old="$(group_bootfile "$bootdir"/winmbr446)"
[ -e "$bsmbr_old" ] && mv "$bsmbr_old" "$bsmbr"
[ -e "$bsmbr" ] || bsmbr="$bootdir"/winmbr."$HOSTGROUP"
[ -e "$bsmbr" ] || bsmbr="$bootdir"/win7mbr."$HOSTGROUP"
[ -e "$bsmbr" ] || bsmbr="$(group_bootfile "$bootdir"/winmbr)"
[ -e "$bsmbr" ] || bsmbr="$(group_bootfile "$bootdir"/win7mbr)"
if [ -e "$bsmbr" ]; then
echo "Restoring windows bootloader from $(basename "$bsmbr")"
case "$bsmbr" in
Expand All @@ -435,7 +448,7 @@ syncl(){
# restore disk & partition uuids on efi systems
if [ -n "$efipart" ]; then
# restore old gptlabel
local gptlabel="$bootdir"/gptlabel."$HOSTGROUP"
local gptlabel="$(group_bootfile "$bootdir"/gptlabel)"
# only if no disk guid file exists
if [ -s "$gptlabel" -a ! -s /mnt/.guid.disk ]; then
echo "Saving current gpt label."
Expand Down
60 changes: 60 additions & 0 deletions tests/shell/test_linbo_sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/bin/sh
#
# test_linbo_sync.sh
# tom.lehmann@netzint.de
# 20260928
#
# group_bootfile: fallback from the school qualified to the plain hardware
# group for windows boot files stored in existing images (#178).

SCRIPT="$(dirname "$0")/../../src/linbofs/usr/bin/linbo_sync"

oneTimeSetUp() {
. "$(dirname "$0")/lib/extract_function.sh"
extract_function "$SCRIPT" group_bootfile > "$SHUNIT_TMPDIR/linbo_sync_group_bootfile.sh"
. "$SHUNIT_TMPDIR/linbo_sync_group_bootfile.sh"
}

setUp() {
bootdir="$SHUNIT_TMPDIR/boot"
rm -rf "$bootdir"
mkdir -p "$bootdir"
}

test_default_school_group_is_unchanged() {
HOSTGROUP="raum101"
assertEquals "$bootdir/BCD.raum101" "$(group_bootfile "$bootdir"/BCD)"
touch "$bootdir/BCD.raum101"
assertEquals "$bootdir/BCD.raum101" "$(group_bootfile "$bootdir"/BCD)"
}

test_qualified_file_is_preferred() {
HOSTGROUP="abc+raum101"
touch "$bootdir/bsmbr.abc+raum101" "$bootdir/bsmbr.raum101"
assertEquals "$bootdir/bsmbr.abc+raum101" "$(group_bootfile "$bootdir"/bsmbr)"
}

test_falls_back_to_plain_group() {
HOSTGROUP="abc+raum101"
touch "$bootdir/gptlabel.raum101"
assertEquals "$bootdir/gptlabel.raum101" "$(group_bootfile "$bootdir"/gptlabel)"
}

test_suffix_is_kept_on_fallback() {
HOSTGROUP="abc+raum101"
touch "$bootdir/BCD.raum101.nvme0n1p3"
assertEquals "$bootdir/BCD.raum101.nvme0n1p3" "$(group_bootfile "$bootdir"/BCD .nvme0n1p3)"
}

test_neither_exists_gives_qualified_name() {
HOSTGROUP="abc+raum101"
assertEquals "$bootdir/BCD.abc+raum101" "$(group_bootfile "$bootdir"/BCD)"
}

test_plain_group_with_hyphen() {
HOSTGROUP="gs-nord+raum-1_a"
touch "$bootdir/BCD.raum-1_a"
assertEquals "$bootdir/BCD.raum-1_a" "$(group_bootfile "$bootdir"/BCD)"
}

. "$(dirname "$0")/shunit2"
Loading