mirror of
https://github.com/QubesOS/qubes-doc.git
synced 2025-11-13 00:30:41 -05:00
Markdown formatting fixes
- mark all code blocks with ``` - unify empty lines between sections - adjust list syntax (no space before dash) - adjust headers to use Atx-style syntax - remove trailing spaces
This commit is contained in:
Maya
Marek Marczykowski-Górecki
parent
2bde7d07e0
commit
67a92614aa
148 changed files with 4025 additions and 3639 deletions
|
|
@ -8,8 +8,7 @@ redirect_from:
|
|||
- /doc/UpgradeToR3.2rc1/
|
||||
---
|
||||
|
||||
Upgrading Qubes R3.1 to R3.2
|
||||
======================================
|
||||
# Upgrading Qubes R3.1 to R3.2
|
||||
|
||||
**Before attempting either an in-place upgrade or a clean installation, we
|
||||
strongly recommend that users [back up their systems](/doc/backup-restore/).**
|
||||
|
|
@ -17,16 +16,17 @@ strongly recommend that users [back up their systems](/doc/backup-restore/).**
|
|||
Current Qubes R3.1 systems can be upgraded in-place to the latest R3.2
|
||||
by following the procedure below.
|
||||
|
||||
Upgrading dom0
|
||||
--------------
|
||||
## Upgrading dom0
|
||||
|
||||
1. Close Qubes Manager (right click on its tray icon -\> Exit)
|
||||
1. Close Qubes Manager (right click on its tray icon -\> Exit)
|
||||
|
||||
2. Open a terminal in Dom0. (E.g., Start -\> System Settings -\> Konsole.)
|
||||
2. Open a terminal in Dom0. (E.g., Start -\> System Settings -\> Konsole.)
|
||||
|
||||
3. Install `qubes-release` package carrying R3.2 repository information.
|
||||
3. Install `qubes-release` package carrying R3.2 repository information.
|
||||
|
||||
sudo qubes-dom0-update --releasever=3.2 qubes-release
|
||||
```
|
||||
sudo qubes-dom0-update --releasever=3.2 qubes-release
|
||||
```
|
||||
|
||||
If you made any manual changes to repository definitions, new definitions
|
||||
will be installed as `/etc/yum.repos.d/qubes-dom0.repo.rpmnew` (you'll see
|
||||
|
|
@ -38,28 +38,32 @@ Upgrading dom0
|
|||
you need to download few more packages manually, but **do not install
|
||||
them** yet:
|
||||
|
||||
sudo qubes-dom0-update systemd-compat-libs perl-libwww-perl perl-Term-ANSIColor perl-Term-Cap gdk-pixbuf2-xlib speexdsp qubes-mgmt-salt-admin-tools lvm2
|
||||
(...)
|
||||
Transaction Summary
|
||||
===============================================================
|
||||
Install 16 Packages (+ 31 Dependent packages)
|
||||
Upgrade 4 Packages (+200 Dependent packages)
|
||||
```
|
||||
sudo qubes-dom0-update systemd-compat-libs perl-libwww-perl perl-Term-ANSIColor perl-Term-Cap gdk-pixbuf2-xlib speexdsp qubes-mgmt-salt-admin-tools lvm2
|
||||
(...)
|
||||
Transaction Summary
|
||||
===============================================================
|
||||
Install 16 Packages (+ 31 Dependent packages)
|
||||
Upgrade 4 Packages (+200 Dependent packages)
|
||||
|
||||
Total download size: 173 M
|
||||
Is this ok [y/d/N]: n
|
||||
Exiting on user command
|
||||
Your transaction was saved, rerun it with:
|
||||
yum load-transaction /tmp/yum_save_tx.....
|
||||
Total download size: 173 M
|
||||
Is this ok [y/d/N]: n
|
||||
Exiting on user command
|
||||
Your transaction was saved, rerun it with:
|
||||
yum load-transaction /tmp/yum_save_tx.....
|
||||
```
|
||||
|
||||
4. Upgrade dom0 to R3.2:
|
||||
|
||||
sudo qubes-dom0-update
|
||||
|
||||
```
|
||||
sudo qubes-dom0-update
|
||||
```
|
||||
|
||||
You may wish to disable the screensaver "Lock screen" feature for this step, as
|
||||
during the update XScreensaver may encounter an "Authentication failed" issue,
|
||||
requiring a hard reboot. Alternatively, you may simply move the mouse regularly.
|
||||
|
||||
5. If the previous step completed successfully, your `qubes-core-dom0` version
|
||||
5. If the previous step completed successfully, your `qubes-core-dom0` version
|
||||
should be `3.2.3` or higher. This can be verified with the command `yum info
|
||||
qubes-core-dom0`. If it's not, repeat the previous step with the `--clean` option.
|
||||
|
||||
|
|
@ -69,22 +73,26 @@ Upgrading dom0
|
|||
actual files were modified. During upgrade, you'll see information about
|
||||
such cases, like:
|
||||
|
||||
warning: /etc/salt/minion.d/f_defaults.conf created as /etc/salt/minion.d/f_defaults.conf.rpmnew
|
||||
```
|
||||
warning: /etc/salt/minion.d/f_defaults.conf created as /etc/salt/minion.d/f_defaults.conf.rpmnew
|
||||
```
|
||||
|
||||
This will happen for every configuration you have modified manually and for
|
||||
a few that has been modified by Qubes scripts. If you are not sure what to
|
||||
do about them, below is a list of commands to deal with few common cases
|
||||
(either keep the old one, or replace with the new one):
|
||||
|
||||
rm -f /etc/group.rpmnew
|
||||
rm -f /etc/shadow.rpmnew
|
||||
rm -f /etc/qubes/guid.conf.rpmnew
|
||||
mv -f /etc/nsswitch.conf{.rpmnew,}
|
||||
mv -f /etc/pam.d/postlogin{.rpmnew,}
|
||||
mv -f /etc/salt/minion.d/f_defaults.conf{.rpmnew,}
|
||||
mv -f /etc/dracut.conf{.rpmnew,}
|
||||
```
|
||||
rm -f /etc/group.rpmnew
|
||||
rm -f /etc/shadow.rpmnew
|
||||
rm -f /etc/qubes/guid.conf.rpmnew
|
||||
mv -f /etc/nsswitch.conf{.rpmnew,}
|
||||
mv -f /etc/pam.d/postlogin{.rpmnew,}
|
||||
mv -f /etc/salt/minion.d/f_defaults.conf{.rpmnew,}
|
||||
mv -f /etc/dracut.conf{.rpmnew,}
|
||||
```
|
||||
|
||||
7. Reboot dom0.
|
||||
7. Reboot dom0.
|
||||
|
||||
Please note that if you use [Anti Evil Maid](/doc/anti-evil-maid), it won't be
|
||||
able to unseal the passphrase the first time the system boots after performing
|
||||
|
|
@ -95,15 +103,15 @@ Maid passphrase to the new configuration. Please consult the Anti Evil Maid
|
|||
|
||||
At first login after upgrade you may got a message like this:
|
||||
|
||||
``
|
||||
Your saved session type 'kde-plasma' is not valid any more.
|
||||
Please select a new one, otherwise 'default' will be used.
|
||||
``
|
||||
|
||||
This is result of upgrade KDE4 (`kde-plasma`) to KDE5 (`plasma`). Simply choose
|
||||
your favorite desktop environment and continue.
|
||||
|
||||
|
||||
Upgrade all Template and Standalone VM(s)
|
||||
-----------------------------------------
|
||||
## Upgrade all Template and Standalone VM(s)
|
||||
|
||||
By default, in Qubes R3.1, there are few TemplateVMs and no StandaloneVMs.
|
||||
However, users are free to create StandaloneVMs More information on using
|
||||
|
|
@ -111,57 +119,67 @@ multiple TemplateVMs, as well as StandaloneVMs, can be found
|
|||
[here](/doc/software-update-vm/). The steps described in this section should be
|
||||
repeated in **all** the user's Template and Standalone VMs.
|
||||
|
||||
|
||||
### Upgrade Fedora templates: ###
|
||||
### Upgrade Fedora templates:
|
||||
|
||||
**Note:** This will only upgrade your Fedora template from Qubes 3.1 to Qubes
|
||||
3.2. This will *not* upgrade your Fedora template from Fedora 23 to Fedora 24.
|
||||
In order to do that, please see the
|
||||
[Fedora 23 template upgrade instructions](/doc/templates/fedora/#upgrading).
|
||||
|
||||
1. Open a terminal in the TemplateVM (or StandaloneVM). (E.g., use Qubes VM
|
||||
1. Open a terminal in the TemplateVM (or StandaloneVM). (E.g., use Qubes VM
|
||||
Manager's right-click menu, choose "Run Command in VM," and type
|
||||
`gnome-terminal` there.)
|
||||
|
||||
2. Install the `qubes-upgrade-vm` package:
|
||||
2. Install the `qubes-upgrade-vm` package:
|
||||
|
||||
sudo dnf install --refresh qubes-upgrade-vm
|
||||
```
|
||||
sudo dnf install --refresh qubes-upgrade-vm
|
||||
```
|
||||
|
||||
3. Proceed with a normal upgrade in the template:
|
||||
3. Proceed with a normal upgrade in the template:
|
||||
|
||||
sudo dnf upgrade --refresh
|
||||
```
|
||||
sudo dnf upgrade --refresh
|
||||
```
|
||||
|
||||
4. Add new packages (only needed in default template):
|
||||
4. Add new packages (only needed in default template):
|
||||
|
||||
sudo dnf install qubes-mgmt-salt-vm-connector
|
||||
```
|
||||
sudo dnf install qubes-mgmt-salt-vm-connector
|
||||
```
|
||||
|
||||
5. Shut down the template VM.
|
||||
5. Shut down the template VM.
|
||||
|
||||
### Upgrade Debian (and Whonix) templates:
|
||||
|
||||
### Upgrade Debian (and Whonix) templates: ###
|
||||
|
||||
1. Open a terminal in the TemplateVM (or StandaloneVM). (E.g., use Qubes VM
|
||||
1. Open a terminal in the TemplateVM (or StandaloneVM). (E.g., use Qubes VM
|
||||
Manager's right-click menu, choose "Run Command in VM," and type
|
||||
`gnome-terminal` there.)
|
||||
|
||||
2. Update repository definition:
|
||||
2. Update repository definition:
|
||||
|
||||
sudo cp /etc/apt/sources.list.d/qubes-r3.list /etc/apt/sources.list.d/qubes-r3-upgrade.list
|
||||
sudo sed -i 's/r3.1/r3.2/' /etc/apt/sources.list.d/qubes-r3-upgrade.list
|
||||
```
|
||||
sudo cp /etc/apt/sources.list.d/qubes-r3.list /etc/apt/sources.list.d/qubes-r3-upgrade.list
|
||||
sudo sed -i 's/r3.1/r3.2/' /etc/apt/sources.list.d/qubes-r3-upgrade.list
|
||||
```
|
||||
|
||||
3. Proceed with a normal update in the template:
|
||||
3. Proceed with a normal update in the template:
|
||||
|
||||
sudo apt-get update
|
||||
sudo apt-get dist-upgrade
|
||||
```
|
||||
sudo apt-get update
|
||||
sudo apt-get dist-upgrade
|
||||
```
|
||||
|
||||
4. Add new packages (only needed in default template):
|
||||
4. Add new packages (only needed in default template):
|
||||
|
||||
sudo apt-get install qubes-mgmt-salt-vm-connector
|
||||
```
|
||||
sudo apt-get install qubes-mgmt-salt-vm-connector
|
||||
```
|
||||
|
||||
5. Remove unnecessary now file:
|
||||
|
||||
sudo rm -f /etc/apt/sources.list.d/qubes-r3-upgrade.list
|
||||
|
||||
6. Shut down the template VM.
|
||||
5. Remove unnecessary now file:
|
||||
|
||||
```
|
||||
sudo rm -f /etc/apt/sources.list.d/qubes-r3-upgrade.list
|
||||
```
|
||||
|
||||
6. Shut down the template VM.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue