Browse code

Fixed ostree repo URL and refspecs that caused rpm-ostree assert and crash. Fixed doc, UI typo.

Danut Moraru authored on 2015/08/20 04:30:51
Showing 6 changed files
... ...
@@ -31,7 +31,6 @@ OSTree host is the installation of Photon that retrives the images from RPM-OSTr
31 31
 Host machines created from RPM-OSTree server can run following commands to upgrade their Host machine to the latest version from RPM-OSTree server.
32 32
 
33 33
 ```
34
-> ostree pull photon tp2/x86_64/minimal
35 34
 > rpm-ostree upgrade
36 35
 > systemctl reboot
37 36
 ```
... ...
@@ -74,7 +74,7 @@ class Installer(object):
74 74
     def exit_gracefully(self, signal, frame):
75 75
         if self.iso_installer:
76 76
             self.progress_bar.hide()
77
-            self.window.addstr(0, 0, 'Opps, Installer got inturrupted.\n\nPress any key to get to the bash...')
77
+            self.window.addstr(0, 0, 'Opps, Installer got interrupted.\n\nPress any key to get to the bash...')
78 78
             self.window.content_window().getch()
79 79
         
80 80
         sys.exit(1)
... ...
@@ -218,7 +218,7 @@ class IsoInstaller(object):
218 218
                     self.validate_ostree_refs_input, # validation function of the input
219 219
                     None, # post processing of the input field
220 220
                     'Please provide the Ref in OSTree repo', 'OSTree Repo Ref:', 2, install_config,
221
-                    "tp2/x86_64/minimal")
221
+                    "photon/tp2/x86_64/minimal")
222 222
             
223 223
             items = items + [
224 224
                     (license_agreement.display, False),
... ...
@@ -1,2 +1,2 @@
1
-OSTREEREPOURL=https://dl.bintray.com/vmware/photon/rpm-ostree/dev/x86_64/minimal
2
-OSTREEREFS=tp2/x86_64/minimal
1
+OSTREEREPOURL=https://dl.bintray.com/vmware/photon/rpm-ostree/1.0TP2
2
+OSTREEREFS=photon/tp2/x86_64/minimal
... ...
@@ -43,7 +43,7 @@ class OstreeInstaller(Installer):
43 43
         self.run("ostree admin --sysroot={} init-fs {}".format(self.photon_root, self.photon_root), "Initializing OSTree filesystem")
44 44
         self.pull_repo(repo_url, repo_ref)
45 45
         self.run("ostree admin --sysroot={} os-init photon ".format(self.photon_root), "OSTree OS Initializing")
46
-        self.run("ostree admin --sysroot={} deploy --os=photon photon/{}".format(self.photon_root, repo_ref), "Deploying")
46
+        self.run("ostree admin --sysroot={} deploy --os=photon photon:{}".format(self.photon_root, repo_ref), "Deploying")
47 47
 
48 48
     def do_systemd_tmpfiles_commands(self, commit_number):
49 49
         prefixes = ["/var/home",
... ...
@@ -3,7 +3,9 @@
3 3
 
4 4
     "osname": "photon",
5 5
 
6
-    "ref": "tp2/x86_64/minimal",
6
+    "ref": "photon/tp2/x86_64/minimal",
7
+
8
+    "automatic_version_prefix": "1.0_tp2_minimal",
7 9
 
8 10
     "repos": ["photon"],
9 11