TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

NAS-130002 / 24.10 / Show vendor name during install (#666)

Browse Source
This commit is contained in:
Aiden
2024-07-22 09:45:09 -04:00
committed by GitHub
parent c13539b708
commit 92c842e46f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scale_build/image/iso.py
View File

@@ -34,8 +34,14 @@ def install_iso_packages_impl():
for package in get_manifest()['iso-packages']:
run_in_chroot(['apt', 'install', '-y', package])
# Inject vendor name into grub.cfg
with open(CONF_GRUB, 'r') as f:
grub_cfg = f.read()
grub_cfg = grub_cfg.replace('$vendor', TRUENAS_VENDOR or 'TrueNAS SCALE')
os.makedirs(os.path.join(CHROOT_BASEDIR, 'boot/grub'), exist_ok=True)
shutil.copy(CONF_GRUB, os.path.join(CHROOT_BASEDIR, 'boot/grub/grub.cfg'))
with open(os.path.join(CHROOT_BASEDIR, 'boot/grub/grub.cfg'), 'w') as f:
f.write(grub_cfg)
def make_iso_file():
@@ -113,7 +119,7 @@ def make_iso_file():
# Debian GRUB EFI searches for GRUB config in a different place
os.makedirs(os.path.join(CD_DIR, 'EFI/debian'), exist_ok=True)
shutil.copy(CONF_GRUB, os.path.join(CD_DIR, 'EFI/debian/grub.cfg'))
shutil.copy(os.path.join(CHROOT_BASEDIR, 'boot/grub/grub.cfg'), os.path.join(CD_DIR, 'EFI/debian/grub.cfg'))
os.makedirs(os.path.join(CD_DIR, 'EFI/debian/fonts'), exist_ok=True)
shutil.copy(os.path.join(CHROOT_BASEDIR, 'usr/share/grub/unicode.pf2'),
os.path.join(CD_DIR, 'EFI/debian/fonts/unicode.pf2'))

4
scripts/grub.cfg
View File

@@ -68,13 +68,13 @@ fi
insmod play
play 960 440 1 0 4 440 1
menuentry --hotkey=i --id=video 'Start TrueNAS SCALE Installation' {
menuentry --hotkey=i --id=video 'Start $vendor Installation' {
load_video
set background_color=black
linux /vmlinuz gfxpayload=text quiet nomodeset boot=live toram=filesystem.squashfs $gfx_console
initrd /initrd.img
}
menuentry --hotkey=j --id=serial 'Start TrueNAS SCALE Installation (115200 baud)' {
menuentry --hotkey=j --id=serial 'Start $vendor Installation (115200 baud)' {
load_video
set background_color=black
linux /vmlinuz gfxpayload=text quiet nomodeset boot=live toram=filesystem.squashfs $gfx_console $serial_console