Browse code

Formatting & syncing with changes in dev branch

Change-Id: Iaf374831c2dd040dd4d5568910f62de3702ebc74
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5936
Reviewed-by: Stuart Clements <sclements@vmware.com>
Tested-by: Stuart Clements <sclements@vmware.com>

Vidya Vasudevan authored on 2018/10/18 12:34:49
Showing 3 changed files
... ...
@@ -26,14 +26,15 @@ The OS name is the same (Photon), so the content in /var and /etc will be transf
26 26
 1. To install fresh, deploy a Photon 1.0 Rev2 host default, as described in [Chapter 2](Photon-RPM-OSTree-2-Installing-a-host-against-default-server-repository.md). Of course, if you already have an existing Photon OS 1.0 host that you want to move to 2.0, skip this step.
27 27
 2. Edit /ostree/repo/config and substitute the url, providing the IP address for the Photon OS 2.0 RPM-OSTree server installed above. This was explained in [Chapter 10](Photon-RPM-OSTree-10-Remotes.md#102-switching-repositories).  
28 28
 ostree should confirm that is the updated server IP for the "photon" remote.
29
-```
30
-root@ostree-host [ ~ ]# ostree remote show-url photon
31
-http://10.118.101.180
32
-```
29
+
30
+    ```
31
+    root@ostree-host [ ~ ]# ostree remote show-url photon
32
+    http://10.118.101.180
33
+    ```
33 34
 3. Rebase your host to the new 2.0 server and Refspec.
35
+ 
34 36
 ```
35 37
 root@ostree-host [ ~ ]# rpm-ostree rebase photon/2.0/x86_64/minimal
36
-
37 38
 549 metadata, 2654 content objects fetched; 119853 KiB transferred in 17 seconds
38 39
 Copying /etc changes: 6 modified, 0 removed, 14 added
39 40
 Transaction complete; bootconfig swap: yes deployment count change: 1
... ...
@@ -172,7 +173,9 @@ root@ostree-host [ ~ ]# rpm-ostree status
172 172
   2017-08-31 18:19:36     2.0_minimal       f4497b1948     photon     photon:photon/2.0/x86_64/minimal
173 173
 * 2017-01-11 02:18:42     1.0_minimal.1     4a21972b29     photon     photon:photon/1.0/x86_64/minimal
174 174
 ```
175
+
175 176
 That's it! You may now reboot to the new Photon OS 2.0 image. The updated ostree and rpm-ostree packages have a slightly changed output format:
177
+
176 178
 ```
177 179
 root@ph2-ostree-host [ ~ ]# rpm-ostree status
178 180
 State: idle
... ...
@@ -1,8 +1,7 @@
1 1
 # FAQ
2 2
 
3
-The [FAQ for Photon OS](https://github.com/vmware/photon/wiki/Frequently-Asked-Questions) is now on the Wiki. 
3
+The [FAQ for Photon OS](Frequently-Asked-Questions.md) is now on the Wiki. 
4 4
 
5
-Technical information about Photon OS and instructions on how to use it appear in the [Photon OS Administration Guide](https://github.com/vmware/photon/blob/master/docs/photon-admin-guide.md). 
6
-
7
-Getting-started guides and how-to articles covering Docker, Mesos, OSTree, VMware platforms, and other technologies appear on the Photon OS [Wiki](https://github.com/vmware/photon/wiki).
5
+Technical information about Photon OS and instructions on how to use it appear in the [Photon OS Administration Guide](photon-admin-guide.md). 
8 6
 
7
+Getting-started guides and how-to articles covering Docker, Mesos, VMware platforms, and other technologies appear on [Photon OS Getting Started Guides](getting-started-guides.md).
9 8
deleted file mode 100644
... ...
@@ -1,34 +0,0 @@
1
-# What is OSTree and RPM-OSTree?
2
-OSTree is a tool for managing bootable, immutable, versioned filesystem trees.
3
-
4
-## Photon RPM-OSTree Server
5
-During installation from the Photon OS ISO, you can select the `Photon RPM-OSTree Server` option to install Photon OS with the RPM-OSTree components and a minimal repository from which RPM-OSTree Hosts can be created.
6
-
7
-On RPM-OSTree Server the repo is created at the following location: 
8
-```
9
-/srv/rpm-ostree/repo
10
-```
11
-Here is the base configuration file that creates the repo:
12
-```
13
-/srv/rpm-ostree/photon-base.json
14
-```
15
-### Updating RPM-OSTree Repo Image
16
-
17
-You can add or remove packages from the `photon-base.json` file and then run following commands to update the repo with a new commit:
18
-```
19
-cd /srv/rpm-ostree
20
-rpm-ostree compose tree --repo=/srv/rpm-ostree/repo photon-base.json
21
-```
22
-The command above creates a new commit that contains your package-related changes.
23
-
24
-## RPM-OSTree Host
25
-
26
-OSTree host is an installation of Photon OS that retrieves the images from RPM-OSTree server during installation. It can get atomic updates from the same server during its lifecycle.
27
-
28
-## Upgrading the Host Installations
29
-
30
-Host machines created from RPM-OSTree server can run the following commands to upgrade their host machine to the latest version from the RPM-OSTree server:
31
-
32
-	rpm-ostree upgrade
33
-	systemctl reboot
34
-