zuevav/Bridge-and-Join-s
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Образ Ubuntu: вариант раскладки для каждой из двух (us,ru) — иначе автоустановка падала с InconsistentMultiLayoutError; md5sum.txt пересчитывается

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014FsEKyJrYF69Cj9ZXzFLRi
This commit is contained in:
zuevav
2026-09-24 16:41:55 +03:00
parent 7ecfee524d
commit e75de4f27d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/iso/build-iso-ubuntu.sh
+11
View File
@@ -62,11 +62,22 @@ xorriso -osirrox on -indev "$SRC" -extract /boot/grub/grub.cfg "$WORK/grub/grub.
sed '/^set timeout/d;/^loadfont/d' "$WORK/grub/grub.orig" | awk '/^menuentry "Ubuntu Server with the HWE kernel"/{skip=1} skip&&/^}/{skip=0;next} !skip' sed '/^set timeout/d;/^loadfont/d' "$WORK/grub/grub.orig" | awk '/^menuentry "Ubuntu Server with the HWE kernel"/{skip=1} skip&&/^}/{skip=0;next} !skip'
} > "$WORK/grub/grub.cfg" } > "$WORK/grub/grub.cfg"
# md5sum.txt: установщик Ubuntu при загрузке сверяет файлы образа по этому списку (casper-md5check);
# несовпадение или отсутствующий файл роняет подсистему Integrity. Убираем удалённые файлы HWE,
# пересчитываем изменённые и добавляем наши.
xorriso -osirrox on -indev "$SRC" -extract /md5sum.txt "$WORK/md5.orig" >/dev/null 2>&1
{
grep -vE '\./casper/(hwe-vmlinuz|hwe-initrd|ubuntu-server-minimal\.ubuntu-server\.installer\.generic-hwe\.squashfs)$|\./boot/grub/grub\.cfg$' "$WORK/md5.orig"
echo "$(md5sum < "$WORK/grub/grub.cfg" | cut -d' ' -f1) ./boot/grub/grub.cfg"
(cd "$WORK" && find bj nocloud -type f | sort | while read -r f; do echo "$(md5sum < "$f" | cut -d' ' -f1) ./$f"; done)
} > "$WORK/md5sum.txt"
rm -f "$OUT" rm -f "$OUT"
xorriso -indev "$SRC" -outdev "$OUT" -boot_image any replay \ xorriso -indev "$SRC" -outdev "$OUT" -boot_image any replay \
-volid "BJ_UBUNTU22" \ -volid "BJ_UBUNTU22" \
-map "$WORK/bj" /bj -map "$WORK/nocloud" /nocloud \ -map "$WORK/bj" /bj -map "$WORK/nocloud" /nocloud \
-map "$WORK/grub/grub.cfg" /boot/grub/grub.cfg \ -map "$WORK/grub/grub.cfg" /boot/grub/grub.cfg \
-map "$WORK/md5sum.txt" /md5sum.txt \
-rm /casper/hwe-vmlinuz /casper/hwe-initrd /casper/ubuntu-server-minimal.ubuntu-server.installer.generic-hwe.squashfs -- \ -rm /casper/hwe-vmlinuz /casper/hwe-initrd /casper/ubuntu-server-minimal.ubuntu-server.installer.generic-hwe.squashfs -- \
-end >/dev/null 2>"$WORK/xorriso.log" || { cat "$WORK/xorriso.log"; exit 1; } -end >/dev/null 2>"$WORK/xorriso.log" || { cat "$WORK/xorriso.log"; exit 1; }
echo "Образ собран: $OUT ($(du -h "$OUT" | cut -f1)), канал $CHANNEL; ядро: $FILES; Валидата: $n пакета" echo "Образ собран: $OUT ($(du -h "$OUT" | cut -f1)), канал $CHANNEL; ядро: $FILES; Валидата: $n пакета"
deploy/iso/ubuntu/user-data.tmpl
+1
View File
@@ -11,6 +11,7 @@ autoinstall:
locale: ru_RU.UTF-8 locale: ru_RU.UTF-8
keyboard: keyboard:
layout: us,ru layout: us,ru
variant: ","
toggle: grp:alt_shift_toggle toggle: grp:alt_shift_toggle
timezone: Europe/Moscow timezone: Europe/Moscow
identity: identity: