Rebase XCP-ng changes onto v10.10.25 #42
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
While developing and/or installing from an already-verified ISO, yum's repo_gpgcheck just gets in the way. This provides a general kill-switch for checking repomd.xml.asc, through commandline or answerfile. Signed-off-by: Yann Dirson <[email protected]>
Originally-by: Nicolas Raynaud <[email protected]> Also adds support for it in the answerfile. the general form is : <raid device="md127"> <disk>sda</disk> <disk>sdb</disk> </raid> avoid question and display waiting message when running mdadm Signed-off-by: Samuel Verschelde <[email protected]> When restoring from backup on a software RAID install, install grub on raid members instead of disk (which is a mdadm device) Signed-off-by: BenjiReis <[email protected]> Orig-commit: 6e168b4 Orig-commit: 7557a00 Orig-commit: ee404b1 Orig-commit: e6497d1 Orig-commit: d33fe10
Similar to no-repo-gpgcheck but for RPM sigs. Signed-off-by: Yann Dirson <[email protected]>
The presence of this parameter changes the installer behavior, preventing local source installation and pre-populating the xcp-ng install url. Originally-by: Nicolas Raynaud <[email protected]> Use the `--netinstall` parameter that is automatically generated at preinit stage and translate it into `answers['netinstall'] = True`. Signed-off-by: Samuel Verschelde <[email protected]> Orig-commit: 36395c3 Orig-commit: 098a2f4 Orig-commit: 0b298cd
Failing to do so can leave the kernel's idea of the partitions in weird states. There are likely bugs underlying those weird state, we just don't want to be impacted by them at this point :) Signed-off-by: Yann Dirson <[email protected]>
Global *gpgcheck flag can change the default from True to False, and these new flags allow to override this default on a per-source basis. Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Samuel Verschelde <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Both fields are used for the 2 IP families and were writen in an IPv4 specific block. Signed-off-by: BenjiReis <[email protected]>
Signed-off-by: BenjiReis <[email protected]>
Inherits from `NetInterface` to mutualize the code Signed-off-by: BenjiReis <[email protected]>
Signed-off-by: BenjiReis <[email protected]>
Add family specific validator as well Signed-off-by: BenjiReis <[email protected]>
Signed-off-by: BenjiReis <[email protected]>
Signed-off-by: BenjiReis <[email protected]>
Signed-off-by: BenjiReis <[email protected]>
Add a screen to choose to configure IPv4, IPv6 or both Display the interface screen for IPv4 and/or IPv6 Signed-off-by: BenjiReis <[email protected]>
Need to add `ndisc6` to the install.img Signed-off-by: BenjiReis <[email protected]>
Add `isDynamic` helper to `NetInterface` Signed-off-by: BenjiReis <[email protected]>
Add `etc/sysctl.d/91-net-ipv6.conf` in the restore list Signed-off-by: BenjiReis <[email protected]>
Covers:
1. repo_gpgcheck:
a. wrong system clock putting gpg key creation in the future, causing a
yum crash (nothing special happens if the date of the signature is in
the future ¯\_(ツ)_/¯)
b. other yum crashes due to uncaught gpg exceptions (if any)
c. lack of repomd signature (while repo_gpgcheck is in force)
d. signature done by other key than the one in ISO ("repomd.xml signature
could not be verified" ¯\_(ツ)_/¯)
2. gpgcheck:
a. RPM signed with unknown key
b. unsigned RPM referenced by unsigned repomd (no-repo-gpgcheck)
c. RPM re-signed with unknown key, unsigned repomd (no-repo-gpgcheck)
d. RPM overwritten with another RPM signed with known key (diagnosed
through hash but, same diag as 2.c)
e. delsigned/resigned/etc RPM, unchanged repomd (same diag as 2.c/d)
Does not cover notably:
- unsigned RPM referenced by (re)signed repomd
In some cases Yum does not give an error, but dies because of an
uncaught exception, which makes this check quite brittle, but in the
worst case if messages change, we still fallback to the original
"Error installing packages" message.
Signed-off-by: Yann Dirson <[email protected]>
In interactive mode, when Driver Disks are used as local media, they must *also* be installed as Supplemental Packs after installation. This change remembers the use of Driver Disks and makes sure the question is asked, even when the supplemental-packs feature is disabled. Signed-off-by: Yann Dirson <[email protected]>
It may not be obvious to users that local-media Driver Disks must be inserted twice during installation. This change uses the memorization of usage of Driver Disks from previous commit, and uses it to explain users they likely wants to insert their Driver Disk again. Signed-off-by: Yann Dirson <[email protected]>
All files matchin `custom.*\.conf` will be kept upon upgrade. See: xapi-project/sm#600 Signed-off-by: BenjiReis <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Also change text for a more suitable description. Originally-by: Samuel Verschelde <[email protected]> Orig-commit: b4ebf81 Orig-commit: 03d3a84 Orig-commit: d3857b8 Orig-commit: 604f0b0 Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
This complements the default choice previously changed in the TUI. Signed-off-by: Yann Dirson <[email protected]>
Before 5abd998 this code was calling grubby's new-kernel-pkg, which unconditionally passes -f to mkinitrd. Not using -f will cause install failure when a driver disk's rpm's scripts have generated an initrd already (as is the case with the intel igb driver) Signed-off-by: Yann Dirson <[email protected]>
If log=True is passed to commit, dump the old and new partition tables before applying the changes. At the same time, fix up the dump code to handle GPT partition tables. Signed-off-by: Ross Lagerwall <[email protected]> (cherry picked from commit 7f58771)
Rebase of simple 8.2.1 patches onto 8.3 codebase
Global and per-source gpgcheck flags
IPv6 support
Don't fail seeing a backup refering to non-existent disk
installFromYum: give more detailed error messages on gpg errors
* xcpng/restore-multipath-conf: Keep user multipath configuration upon upgrade
* driver-disks: Clarify Supplemental Packs dialog in presence of Driver Disks Always show Supplemental Packs dialog if Driver Disks are used.
__mkinitrd: pass -f to dracut
Enhance tracing to hunt for restore bug
disktool: Optionally dump old/new partitions during commit
Upgrade: forbid upgrading with a key XAPI will reject
Backport from master. Signed-off-by: Yann Dirson <[email protected]>
ydirson
force-pushed
the
ydi/10.10.25-8.3
branch
from
392209c to
0168a77
Compare
|
Last push:
|
e9d686a triggers an unmount of backup_fs before we're done with it, causing a restoration failure in 10.10.25: INFO [2025-03-19 14:33:50] INSTALL FAILED. INFO [2025-03-19 14:33:50] A fatal exception occurred: INFO [2025-03-19 14:33:50] Traceback (most recent call last): File "/opt/xensource/installer/install.py", line 274, in go restore.restoreFromBackup(backup, progress) File "/opt/xensource/installer/restore.py", line 214, in restoreFromBackup branding = util.readKeyValueFile(os.path.join(backup_fs.mount_point, constants.INVENTORY_FILE)) File "/opt/xensource/installer/util.py", line 322, in readKeyValueFile f = open(filename, "r") IOError: [Errno 2] No such file or directory: '/tmp/restore-backup-hrJwAR/etc/xensource-inventory' Fortunately that data we want was already loaded, so this is a minimal fix. Signed-off-by: Yann Dirson <[email protected]>
ydirson
force-pushed
the
ydi/10.10.25-8.3
branch
from
8740d91 to
89e2629
Compare
because the tags have not been imported from upstream. fixes that |
Pushed |
glehmann
approved these changes
Mar 24, 2025
stormi
approved these changes
Mar 24, 2025
ydirson
commented
Apr 2, 2025
Comment on lines
681
to
+689
|
|
||
| return restore_list | ||
|
|
||
| # Keep IPv6 enablement/disablement upon upgrades | ||
| self.restore_list += ['etc/sysctl.d/91-net-ipv6.conf'] | ||
|
|
||
| # Keep user multipath configuration | ||
| self.restore_list += [{'dir': 'etc/multipath/conf.d', 're': re.compile(r'custom.*\.conf')}] | ||
|
|
There was a problem hiding this comment.
Wow, @glehmann somehow we missed this mismerge
There was a problem hiding this comment.
Indeed git range-diff ignores merge commits and does not give the option to include them.
There was a problem hiding this comment.
we'd best rebase the ipv6 branch on 10.10.25+ instead to reduce conflicts
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.