replaced all github flavored code blocks with fenced kramdown code blocks

This commit is contained in:
Jeepler 2015-09-27 01:00:33 +02:00
parent df467baf1c
commit 39ef7373fd
58 changed files with 609 additions and 609 deletions

View file

@ -33,9 +33,9 @@ Note that dom0 in R2 is based on Fedora 20, in contrast to Fedora 18 in previous
1. Install all the updates for Dom0:
```
~~~
sudo qubes-dom0-update
```
~~~
After this step you should have `qubes-release-2-5` in your Dom0. Important: if you happen to have `qubes-release-2-6*` then you should downgrade to `qubes-release-2-5`! The `qubes-release-2-6*` packages have been uploaded to the testing repos and were kept there for a few hours, until we realized they bring incorrect repo definitions and so we removed them and also have changed the update procedure a bit (simplifying it).
@ -43,18 +43,18 @@ After this step you should have `qubes-release-2-5` in your Dom0. Important: if
Note: be sure that the VM used as a update-downloading-vm (by default its the firewallvm based on the default template) has been updated to the latest qubes packages, specifically `qubes-core-vm-2.1.33` or later. This doesn't imply that the VM must already be upgraded to fc20 -- for Dom0 upgrade we could still use an fc18-based VM (updatevm) it is only important to install the latest Qubes packages there.
```
~~~
sudo qubes-dom0-update qubes-dom0-dist-upgrade
sudo qubes-dom0-update
```
~~~
1. If above step completed successfully you should have `qubes-release-2-9` or later. If not, repeat above step with additional `--clean` option.
4a. If you chose not to upgrade your fc18 templates, but instead to download our new fc20-based template you should now be able to do that by simply typing:
```
~~~
sudo qubes-dom0-update qubes-template-fedora-20-x64
```
~~~
1. Reboot the system.

View file

@ -22,26 +22,26 @@ By default, in Qubes R1, there is only one Template VM, however users are free t
1. Open terminal in the template VM (or standalone VM). E.g. use the Qubes Manager's right-click menu and choose Run Command in VM and type `gnome-terminal` there.
2. Install `qubes-upgrade-vm` package (this package brings in R2 repo definitions and R2 keys)
```
~~~
sudo yum install qubes-upgrade-vm
```
~~~
3. Proceed with normal update in the template (this should bring in also the R2 packages for the VMs):
```
~~~
sudo yum update
```
~~~
The installer (yum) will prompt to accept the new Qubes R2 signing key:
```
~~~
Importing GPG key 0x0A40E458:
Userid : "Qubes OS Release 2 Signing Key"
Fingerprint: 3f01 def4 9719 158e f862 66f8 0c73 b9d4 0a40 e458
Package : qubes-upgrade-vm-1.0-1.fc17.x86_64 (@qubes-vm-current)
From : /etc/pki/rpm-gpg/RPM-GPG-KEY-upgrade-qubes-2-primary
Is this ok [y/N]:
```
~~~
If you see (as is the case on the "screenshot" above) that the new key was imported from a local filesystem (`/etc/pki/rpm-gpg/...`) you can safely accept the key, without checking its fingerprint. This is because there were only two ways for such a key to make it to your Template VM's filesystem:
@ -58,17 +58,17 @@ Be sure to do steps described in this section after *all* your template and stan
1. Open terminal in Dom0. E.g. Start-\>System Settings-\>Konsole.
2. Upgrade the `qubes-release` package to the latest version which brings in new repo definitions and R2 signing keys:
```
~~~
sudo qubes-dom0-update qubes-release
```
~~~
This should install `qubes-release-1-6` in your Dom0.
3. Install R2 packages:
```
~~~
sudo qubes-dom0-update --releasever=2
```
~~~
4. Reboot your system. Please note that if you use Anti Evil Maid, then it won't be able to unseal the passphrase this time, because the Xen, kernel, and initramfs binaries have changed. Once the system boots up again, you could reseal your Anti Evil Maid's passphrase to the new configuration. Please consult Anti Evil Maid documentation for explanation on how to do that.

View file

@ -20,26 +20,26 @@ By default, in Qubes R1, there is only one Template VM, however users are free t
1. Open terminal in the template VM (or standalone VM). E.g. use the Qubes Manager's right-click menu and choose Run Command in VM and type `gnome-terminal` there.
2. Install `qubes-upgrade-vm` package (this package brings in R2 repo definitions and R2 keys)
```
~~~
sudo yum install qubes-upgrade-vm
```
~~~
3. Proceed with normal update in the template (this should bring in also the R2 packages for the VMs):
```
~~~
sudo yum update
```
~~~
The installer (yum) will prompt to accept the new Qubes R2 signing key:
```
~~~
Importing GPG key 0x0A40E458:
Userid : "Qubes OS Release 2 Signing Key"
Fingerprint: 3f01 def4 9719 158e f862 66f8 0c73 b9d4 0a40 e458
Package : qubes-upgrade-vm-1.0-1.fc17.x86_64 (@qubes-vm-current)
From : /etc/pki/rpm-gpg/RPM-GPG-KEY-upgrade-qubes-2-primary
Is this ok [y/N]:
```
~~~
If you see (as is the case on the "screenshot" above) that the new key was imported from a local filesystem (`/etc/pki/rpm-gpg/...`) you can safely accept the key, without checking its fingerprint. This is because there were only two ways for such a key to make it to your Template VM's filesystem:
@ -53,13 +53,13 @@ Installing new template
Qubes R2 Beta2 brings new fedora-18-x64 template (based on Fedora 18). You can install it from Qubes installation DVD. Insert installation DVD into your drive and issue following commmands:
```
~~~
$ sudo -s
# mkdir -p /mnt/cdrom
# mount /dev/cdrom /mnt/cdrom # you can also use ISO image instead of /dev/cdrom; then add -o loop option
# yum install /mnt/cdrom/Packages/q/qubes-template-fedora-18-x64*rpm
# umount /mnt/cdrom
```
~~~
If you already have fedora-17-x64, you can also upgrade it to fedora-18-x64 following [standard Fedora upgrade procedure](http://fedoraproject.org/wiki/Upgrading_Fedora_using_yum) (only "yum" method will work in Qubes VM).
@ -71,31 +71,31 @@ Be sure to do steps described in this section after *all* your template and stan
1. Open terminal in Dom0. E.g. Start-\>System Settings-\>Konsole.
2. Upgrade the `qubes-release` package to the latest version which brings in new repo definitions and R2 signing keys:
```
~~~
sudo qubes-dom0-update qubes-release
```
~~~
This should install `qubes-release-1-6` in your Dom0.
3. Install R2 upgrade package:
```
~~~
sudo qubes-dom0-update --releasever=1 qubes-dist-upgrade
```
~~~
4. Start upgrade process:
```
~~~
sudo qubes-dist-upgrade
```
~~~
5. Follow instructions on screen, first stage of upgrade should end up with reboot request.
6. Reboot your system, ensure that you choose "Qubes Upgrade" boot option.
7. When system starts up, login and start start
```
~~~
sudo qubes-dist-upgrade
```
~~~
again. This will start second stage of upgrade, here most packages will be upgraded, so this will take a while.

View file

@ -24,21 +24,21 @@ It is critical to complete this step **before** proceeding to dom0 upgrade. Othe
1. Open terminal in the template VM (or standalone VM). E.g. use the Qubes Manager's right-click menu and choose Run Command in VM and type `gnome-terminal` there.
2. Proceed with normal update in the template:
```
~~~
sudo yum update
```
~~~
3. Ensure that you've got qubes-core-vm package version 2.1.13-3.fc18:
```
~~~
rpm -q qubes-core-vm
```
~~~
4. Update the system to R2 beta3 packages:
```
~~~
sudo yum --enablerepo=qubes-vm-r2b3-current update
```
~~~
5. **Do not** shutdown the VM.
@ -50,24 +50,24 @@ Be sure to do steps described in this section after *all* your template and stan
1. Open terminal in Dom0. E.g. Start-\>System Settings-\>Konsole.
2. Upgrade the `qubes-release` package to the latest version which brings in new repo definitions and R2 signing keys:
```
~~~
sudo qubes-dom0-update qubes-release
```
~~~
This should install `qubes-release-2-3.1` in your Dom0.
3. Upgrade dom0 to R2 beta3:
```
~~~
sudo qubes-dom0-update --enablerepo=qubes-dom0-r2b3-current
```
~~~
4. If above step completed successfully you should have qubes-core-dom0 at least 2.1.34. If not, repeat above step with additional `--clean` option.
5. Now is the time to shutdown all the VMs:
```
~~~
qvm-shutdown --all --wait
```
~~~
6. Reboot the system.