Script generated boot menu for all arches #1613
Conversation
- Newly added x86_64 and aarch64 write stock copies from kiwi generated grub.cfg - Intel uefi boot fix from "Boot from disk item" (gh#agama-project#1609) - Keep -x on purpose for future trubleshooting (advice from Marcus) - Use $kiwi_iname instead of static agama-live reference in all of config-cdroom/* with exception of s390x, where for some reason we use SUSE Linux... string instead
lkocman
changed the title
There was a problem hiding this comment.
@jreidinger is our expert on the bootloader, so I would appreciate his review. From my POV the changes make sense.
Thanks a lot!
Co-authored-by: Imobach González Sosa <igonzalezsosa@suse.com>
|
|
||
| dst=${1#iso:} | ||
|
|
||
| # KIWI config |
There was a problem hiding this comment.
It's important to do this after setting $dst. I was not able to get acccess to $kiwi_* variables (set in /.profile) fix_bootconfig.$arch . So I simply copied the .profile into the $dst from where the xorriso -> fix_bootconfig.$arch was executed.
This was working (vars inherited, without copying the file) if the fix_bootconfig was called outside xorriso.
| echo 'Loading kernel...' | ||
| linux /boot/ppc64le/linux | ||
| echo 'Loading initrd...' | ||
| initrd /boot/ppc64le/initrd | ||
| } | ||
|
|
||
| menuentry 'Check Installation Media -- Agama Live' --class os --unrestricted { | ||
| menuentry "Check Installation Media -- $kiwi_iname" --class os --unrestricted { |
There was a problem hiding this comment.
I felt that it would be nice to cosistently use $kiwi_iname across all arches. I did not dare to touch s390x.
| } | ||
| menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os { | ||
| if search --no-floppy --file /efi/boot/fallback.efi --set ; then | ||
| for os in opensuse sles leap; do |
There was a problem hiding this comment.
Seems like somebody exchanged opensuse for leap in the past ... so now Agama:Devel/agama-installer has leap too :-)
| source .profile | ||
| cp .profile "$dst" | ||
| fi | ||
|
|
||
| arch=`uname -m` | ||
|
|
||
| # removing live root setting from command line - it's in /etc/cmdline.d instead |
There was a problem hiding this comment.
I don't think that this block is needed since we have now static grub.cfg
| initrd (\$root)/boot/aarch64/loader/initrd | ||
| } | ||
| menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os { | ||
| exit |
There was a problem hiding this comment.
do you test if that exit works properly on arm? does it move to the next entry in boot menu?
There was a problem hiding this comment.
Hello Josef, this was a copypaste from the Arm agama-installer without any modifications.
There was a problem hiding this comment.
but nope we currently only test on intel in openQA and I have no arm device at hand.
|
the USB based legacy boot (with usb being the first boot device) still has struggle but that was also before this PR. |
Prepare for releasing Agama 10· * #1263 * #1330 * #1407 * #1408 * #1410 * #1411 * #1412 * #1416 * #1417 * #1419 * #1420 * #1421 * #1422 * #1423 * #1424 * #1425 * #1428 * #1429 * #1430 * #1431 * #1432 * #1433 * #1436 * #1437 * #1438 * #1439 * #1440 * #1441 * #1443 * #1444 * #1445 * #1449 * #1450 * #1451 * #1452 * #1453 * #1454 * #1455 * #1456 * #1457 * #1459 * #1460 * #1462 * #1464 * #1465 * #1466 * #1467 * #1468 * #1469 * #1470 * #1471 * #1472 * #1473 * #1475 * #1476 * #1477 * #1478 * #1479 * #1480 * #1481 * #1482 * #1483 * #1484 * #1485 * #1486 * #1487 * #1488 * #1489 * #1491 * #1492 * #1493 * #1494 * #1496 * #1497 * #1498 * #1499 * #1500 * #1501 * #1502 * #1503 * #1504 * #1505 * #1506 * #1507 * #1508 * #1510 * #1511 * #1512 * #1513 * #1514 * #1515 * #1516 * #1517 * #1518 * #1519 * #1520 * #1522 * #1523 * #1524 * #1525 * #1526 * #1527 * #1528 * #1529 * #1530 * #1531 * #1532 * #1533 * #1534 * #1535 * #1536 * #1537 * #1540 * #1541 * #1543 * #1544 * #1545 * #1546 * #1547 * #1548 * #1549 * #1550 * #1552 * #1553 * #1554 * #1555 * #1556 * #1557 * #1558 * #1559 * #1560 * #1562 * #1563 * #1565 * #1566 * #1567 * #1568 * #1569 * #1570 * #1571 * #1572 * #1573 * #1574 * #1575 * #1576 * #1577 * #1578 * #1579 * #1580 * #1581 * #1583 * #1584 * #1585 * #1586 * #1587 * #1588 * #1589 * #1590 * #1591 * #1592 * #1593 * #1596 * #1597 * #1598 * #1600 * #1602 * #1605 * #1606 * #1607 * #1608 * #1610 * #1611 * #1612 * #1613 * #1614 * #1619 * #1620 * #1621
Fixes Issue #1609
Newly added x86_64 and aarch64 write stock copies from kiwi generated grub.cfg
Intel uefi boot fix from "Boot from disk item" (gh#Boot local option in Agama doesn't work on UEFI #1609)
Keep -x on purpose for future trubleshooting (advice from Marcus)
Use $kiwi_iname instead of static agama-live reference in all of config-cdroom/* with exception of s390x, where for some reason we use SUSE Linux... string instead
copy .profile to $dst so we can source it from fixboot scripts. Somehow xorriso looses access to ENV from parent which has access to kiwi_iname and other kwiwi variables