Repository navigation
Conversation
81e746c to
25ea853
Compare
|
Thanks, this matches what we agreed in #178. I went through all uses of We'll merge once the lab test is done: restoring an existing Windows image on a migrated non-default-school client, BIOS and EFI, as you listed in the PR description. Please post the result here. This is a linbofs change and has to reach the clients before the base7 migration does, so we'll release it first. Before merging, please change two things in the commit:
Also, please use |
25ea853 to
37a173e
Compare
linbo_create_image stores the windows boot files BCD and bsmbr in the image keyed by $HOSTGROUP (older images may also carry gptlabel), and linbo_sync restores them by the same name. Once hardware groups of non-default schools become school qualified (<school>+<group>, linuxmuster#178), a migrated client syncing an image created before looks for e.g. BCD.abc+raum101, finds only BCD.raum101 and skips the BCD and boot sector restore (and the gpt label restore for older images). On EFI that can leave Windows unbootable. Look the files up through a new group_bootfile(), which falls back to the plain group (the part after the "+") when only that file exists. For default-school groups (no "+") both names are the same, so behaviour there is unchanged. Refs linuxmuster#178 Signed-off-by: Tom Lehmann <tom.lehmann@netzint.de> Assisted-by: Claude
37a173e to
b4fabfb
Compare
|
Thanks for the review. The three commit changes are in: the Lab test, status. It is set up but blocked, and I found an issue that affects the whole #178 design; details are in #178. What is in place on the 7.4 dev server (school
What blocks it: the client's Two limits of the test, so you know in advance:
|
Part of #178, the
linbo_syncfallback agreed there.Problem
linbo_create_imagestores the Windows boot filesBCD.$HOSTGROUP[.<part>]andbsmbr.$HOSTGROUPinside the image, andlinbo_syncrestores them by the same name. Older images may also carrygptlabel.$HOSTGROUP(and the olderwinmbr*names), whichlinbo_syncstill restores. Once hardware groups of non-default schools are school-qualified (<school>+<group>, see linuxmuster/linuxmuster-base7#206), a migrated client syncing an image created before looks forBCD.abc+raum101and finds onlyBCD.raum101. It then skips the BCD and boot sector restore (and the GPT label restore for older images). On EFI that can leave Windows unbootable.Change
New
group_bootfile path [suffix]returnspath.$HOSTGROUP[suffix]. If that file doesn't exist but the one for the plain group (${HOSTGROUP#*+}) does, it returns that one instead. It is used forBCD,bsmbr, the olderwinmbr446/winmbr/win7mbrnames andgptlabel.For default-school groups (no
+) both names are the same, so behaviour there is unchanged. A qualified file is always preferred, so images re-created after the migration use their own files.This is a linbofs change, so clients need the rebuilt linbofs. It should be released before the base7 migration reaches clients.
Testing
tests/shell/test_linbo_sync.sh, 6 tests: default-school unchanged, qualified file preferred, fallback to the plain group, suffix kept on fallback, qualified name when neither exists, and group names containing-/_.sh tests/shell/run.shandbusybox ash tests/shell/run.sh: all test files OK.