First draft of 4.2 update #11
Merged
Conversation
This file contains 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
First draft of update script from 4.1 to 4.2
marmarek
requested changes
Jul 25, 2023
qubes-dist-upgrade.sh
Outdated
| @@ -474,7 +109,7 @@ if [[ $EUID -ne 0 ]]; then | |||
| exit 1 | |||
| fi | |||
|
|
|||
| if ! OPTS=$(getopt -o htrlsgydu:n:f:jkp --long help,all,update,template-standalone-upgrade,release-upgrade,dist-upgrade,setup-efi-grub,assumeyes,double-metadata-size,usbvm:,netvm:,updatevm:,skip-template-upgrade,skip-standalone-upgrade,resync-appmenus-features,post-reboot,only-update:,max-concurrency:,keep-running: -n "$0" -- "$@"); then | |||
| if ! OPTS=$(getopt -o htrlsgydu:n:f:jkp --long help,all,update,template-standalone-upgrade,release-upgrade,dist-upgrade,assumeyes,usbvm:,netvm:,updatevm:,skip-template-upgrade,skip-standalone-upgrade,resync-appmenus-features,post-reboot,only-update:,max-concurrency:,keep-running: -n "$0" -- "$@"); then | |||
There was a problem hiding this comment.
drop also short options that don't exist anymore
marmarta
force-pushed
the
update4.2
branch
3 times, most recently
from
db1b968 to
a133b49
Compare
noskb
reviewed
Jul 28, 2023
| # Removing xen-qubes-vm pkg disables this service, even though it's still | ||
| # present in the system (via xen-runtime package now). | ||
| systemctl preset xendriverdomain | ||
| dnf swap--allowerasing pulseaudio pipewire-pulseaudio |
There was a problem hiding this comment.
Suggested change
| dnf swap--allowerasing pulseaudio pipewire-pulseaudio | |
| dnf swap --allowerasing pulseaudio pipewire-pulseaudio |
To make changing them less painful.
|
PipelineRetry |
marmarek
reviewed
Jul 28, 2023
qubes-dist-upgrade.sh
Outdated
| default_kernel_package="$(rpm --qf '%{NAME}' -qf "$default_kernel_path")" | ||
| if [ "$default_kernel_package" = "kernel-qubes-vm" ]; then | ||
| new_kernel=$(rpm -q --qf '%{VERSION}-%{RELEASE}\n' kernel-qubes-vm | sort -V | tail -1) | ||
| new_kernel="${new_kernel%.qubes}" # TODO: does this work? check with tests |
There was a problem hiding this comment.
No, it doesn't, there may be 6.1.38-1.qubes.fc37. Try new_kernel="${new_kernel/.qubes/}"
marmarta
force-pushed
the
update4.2
branch
3 times, most recently
from
ce27676 to
fb457d4
Compare
marmarek
requested changes
Aug 5, 2023
qubes-dist-upgrade.sh
Outdated
| keep_running+=( "${updates_proxy[@]}" ) | ||
| fi | ||
| if [ -e "/etc/qubes-rpc/policy/qubes.UpdatesProxy" ]; then | ||
| mapfile -t updates_proxy_new < <(grep qubes.UpdatesProxy /etc/qubes/policy.d/*policy | grep '^\s*[^#].*target=' | cut -d = -f 2) |
There was a problem hiding this comment.
Technically it should be *.policy
Also take --assume-yes into account when removing backup.
marmarek
approved these changes
Aug 14, 2023
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.
First draft of update script from 4.1 to 4.2
QubesOS/qubes-issues#7832