QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: update Qubes-specific code for Fedora 21 version

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-03-23 19:42:12 +01:00 committed by Jon Griffiths
parent 3e63d1dd37
commit 63da7da0ec
7 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
anaconda/data/help/en-US/FedoraPlaceholder.html
View File

@ -1,5 +0,0 @@
<body>
<h1>The Anaconda built-in help</h1>
<p>...is not yet available for this screen.</p>
<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead.</p>
</body>

5
anaconda/data/help/en-US/QubesPlaceholder.html Normal file
View File

@ -0,0 +1,5 @@
<body>
<h1>The Anaconda built-in help</h1>
<p>...is not yet available for this screen.</p>
<p>You can check the Anaconda wiki page, the Qubes Installation Guide or other online help resources instead.</p>
</body>

4
anaconda/data/help/en-US/FedoraPlaceholderWithLinks.html → anaconda/data/help/en-US/QubesPlaceholderWithLinks.html
View File

@ -1,10 +1,10 @@
<body> <body>
<h1>The Anaconda built-in help</h1> <h1>The Anaconda built-in help</h1>
<p>...is not yet available for this screen.</p> <p>...is not yet available for this screen.</p>
<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead:</p> <p>You can check the Anaconda wiki page, the Qubes Installation Guide or other online help resources instead:</p>
<p> <p>
<ul> <ul>
<li><a href="http://docs.fedoraproject.org/en-US/Fedora/20/html/Installation_Guide/">Fedora Installation Guide</a></li> <li><a href="https://wiki.qubes-os.org/wiki/InstallationGuideR3">Qubes R3 Installation Guide</a></li>
<li><a href="https://fedoraproject.org/wiki/Anaconda">Anaconda Wiki</a></li> <li><a href="https://fedoraproject.org/wiki/Anaconda">Anaconda Wiki</a></li>
<li><a href="http://fedoraproject.org/wiki/Anaconda_Boot_Options">Anaconda Boot Options</a></li> <li><a href="http://fedoraproject.org/wiki/Anaconda_Boot_Options">Anaconda Boot Options</a></li>
<li><a href="http://fedoraproject.org/wiki/Anaconda/Kickstart">Anaconda Kickstart</a></li> <li><a href="http://fedoraproject.org/wiki/Anaconda/Kickstart">Anaconda Kickstart</a></li>

5
anaconda/data/help/en-US/RHEL7Placeholder.html
View File

@ -1,5 +0,0 @@
<body>
<h1>The Anaconda built-in help</h1>
<p>...is not yet available for this screen.</p>
<p>You can check out the Red Hat Enterprise Linux 7 Installation Guide or other online help resources instead.</p>
</body>

11
anaconda/data/help/en-US/RHEL7PlaceholderWithLinks.html
View File

@ -1,11 +0,0 @@
<body>
<h1>The Anaconda built-in help</h1>
<p>...is not yet available for this screen.</p>
<p>You can check the Red Hat Enterprise Linux 7 Installation Guide or Red Hat Customer Portal resources instead:</p>
<p>
<ul>
<li><a href="https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/index.html">Red Hat Enterprise Linux 7 Installation Guide</a></li>
<li><a href="https://access.redhat.com">Red Hat Customer Portal</a></li>
</ul>
</p>
</body>

2
anaconda/pyanaconda/bootloader.py
View File

@ -1547,7 +1547,7 @@ class GRUB2(GRUB):
log.error("bootloader password setup failed: %s", e) log.error("bootloader password setup failed: %s", e)
# disable non-xen entries # disable non-xen entries
os.chmod("%s/etc/grub.d/10_linux" % ROOT_PATH, 0644) os.chmod("%s/etc/grub.d/10_linux" % iutil.getSysroot(), 0644)
# make sure the default entry is the OS we are installing # make sure the default entry is the OS we are installing
entry_title = "0" entry_title = "0"

14
anaconda/pyanaconda/installclasses/qubes.py
View File

@ -22,11 +22,8 @@ from pyanaconda.installclass import BaseInstallClass
from pyanaconda.constants import * from pyanaconda.constants import *
from pyanaconda.product import * from pyanaconda.product import *
from pyanaconda import network from pyanaconda import network
from pyanaconda import isys from pyanaconda.i18n import N_
import os, types import os, types
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
from decimal import Decimal from decimal import Decimal
@ -42,10 +39,19 @@ class InstallClass(BaseInstallClass):
hidden = 0 hidden = 0
efi_dir = 'qubes' efi_dir = 'qubes'
_l10n_domain = "anaconda"
installUpdates = False
efi_dir = "qubes"
bootloaderTimeoutDefault = 5 bootloaderTimeoutDefault = 5
tasks = [(N_("Minimal"), ["base", "base-x", "kde-desktop-qubes", "qubes" ]) ] tasks = [(N_("Minimal"), ["base", "base-x", "kde-desktop-qubes", "qubes" ]) ]
help_placeholder = "QubesPlaceholder.html"
help_placeholder_with_links = "QubesPlaceholderWithLinks.html"
def getPackagePaths(self, uri): def getPackagePaths(self, uri):
if not type(uri) == types.ListType: if not type(uri) == types.ListType:
uri = [uri,] uri = [uri,]