preliminary work for SSL support in iPXE. untested and probably not currently functional.
This commit is contained in:
parent
5ac510762c
commit
528949e82a
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,6 +24,7 @@
|
|||||||
*.swp
|
*.swp
|
||||||
*.lck
|
*.lck
|
||||||
*~
|
*~
|
||||||
|
.~lock.*
|
||||||
/extrasrc
|
/extrasrc
|
||||||
|
|
||||||
# You should really generate local copies of these, as they're pretty private.
|
# You should really generate local copies of these, as they're pretty private.
|
||||||
|
99
bdisk/bSSL.py
Executable file
99
bdisk/bSSL.py
Executable file
@ -0,0 +1,99 @@
|
|||||||
|
import OpenSSL
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import datetime
|
||||||
|
import re
|
||||||
|
|
||||||
|
def verifyCert(cert, key, CA = None):
|
||||||
|
# Verify a given certificate against a certificate.
|
||||||
|
# Optionally verify against a CA certificate as well (Hopefully. If/when PyOpenSSL ever supports it.)
|
||||||
|
chk = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
|
||||||
|
chk.use_privatekey(key)
|
||||||
|
chk.use_certificate(cert)
|
||||||
|
try:
|
||||||
|
chk.check_privatekey()
|
||||||
|
except OpenSSL.SSL.Error:
|
||||||
|
exit(("{0}: Key does not match certificate!".format(datetime.datetime.now())))
|
||||||
|
else:
|
||||||
|
print("{0}: Key verified against certificate successfully.".format(datetime.datetime.now()))
|
||||||
|
# This is disabled because there doesn't seem to currently be any way
|
||||||
|
# to actually verify certificates against a given CA.
|
||||||
|
#if CA:
|
||||||
|
# try:
|
||||||
|
# magic stuff here
|
||||||
|
|
||||||
|
def sslCAKey():
|
||||||
|
key = OpenSSL.crypto.PKey()
|
||||||
|
print("{0}: Generating SSL CA key...".format(datetime.datetime.now()))
|
||||||
|
key.generate_key(OpenSSL.crypto.TYPE_RSA, 4096)
|
||||||
|
#print OpenSSL.crypto.dump_privatekey(OpenSSL.crypto.FILETYPE_PEM, key)
|
||||||
|
return(key)
|
||||||
|
|
||||||
|
def sslCA(conf, key = None):
|
||||||
|
if not key:
|
||||||
|
try:
|
||||||
|
key = conf['ipxe']['ssl_cakey']
|
||||||
|
except:
|
||||||
|
exit("{0}: Cannot find a valid CA Key to use.".format(datetime.datetime.now()))
|
||||||
|
domain = (re.sub('^(https?|ftp)://([a-z0-9.-]+)/?.*$', '\g<2>',
|
||||||
|
conf['ipxe']['uri'],
|
||||||
|
flags=re.IGNORECASE)).lower()
|
||||||
|
# http://www.pyopenssl.org/en/stable/api/crypto.html#pkey-objects
|
||||||
|
# http://docs.ganeti.org/ganeti/2.14/html/design-x509-ca.html
|
||||||
|
ca = OpenSSL.crypto.X509()
|
||||||
|
ca.set_version(3)
|
||||||
|
ca.set_serial_number(1)
|
||||||
|
ca.get_subject().CN = domain
|
||||||
|
ca.gmtime_adj_notBefore(0)
|
||||||
|
# valid for ROUGHLY 10 years. years(ish) * days * hours * mins * secs.
|
||||||
|
# the paramater is in seconds, which is why we need to multiply them all together.
|
||||||
|
ca.gmtime_adj_notAfter(10 * 365 * 24 * 60 * 60)
|
||||||
|
ca.set_issuer(ca.get_subject())
|
||||||
|
ca.set_pubkey(key)
|
||||||
|
ca.add_extensions([
|
||||||
|
OpenSSL.crypto.X509Extension("basicConstraints",
|
||||||
|
True,
|
||||||
|
"CA:TRUE, pathlen:0"),
|
||||||
|
OpenSSL.crypto.X509Extension("keyUsage",
|
||||||
|
True,
|
||||||
|
"keyCertSign, cRLSign"),
|
||||||
|
OpenSSL.crypto.X509Extension("subjectKeyIdentifier",
|
||||||
|
False,
|
||||||
|
"hash",
|
||||||
|
subject = ca),])
|
||||||
|
ca.sign(key, "sha512")
|
||||||
|
#print OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, ca)
|
||||||
|
return(ca)
|
||||||
|
|
||||||
|
def sslCKey():
|
||||||
|
key = OpenSSL.crypto.PKey()
|
||||||
|
print("{0}: Generating SSL Client key...".format(datetime.datetime.now()))
|
||||||
|
key.generate_key(OpenSSL.crypto.TYPE_RSA, 4096)
|
||||||
|
#print OpenSSL.crypto.dump_privatekey(OpenSSL.crypto.FILETYPE_PEM, key)
|
||||||
|
return(key)
|
||||||
|
|
||||||
|
def sslCSR(conf, key):
|
||||||
|
domain = (re.sub('^(https?|ftp)://([a-z0-9.-]+)/?.*$', '\g<2>',
|
||||||
|
conf['ipxe']['uri'],
|
||||||
|
flags=re.IGNORECASE)).lower()
|
||||||
|
csr = OpenSSL.crypto.X509Req()
|
||||||
|
csr.get_subject().CN = domain
|
||||||
|
csr.set_pubkey(key)
|
||||||
|
csr.sign(key, "sha512")
|
||||||
|
#print OpenSSL.crypto.dump_certificate_request(OpenSSL.crypto.FILETYPE_PEM, req)
|
||||||
|
return(csr)
|
||||||
|
|
||||||
|
def sslSign(ca, key, csr):
|
||||||
|
ca_cert = OpenSSL.crypto.load_certificate(ca)
|
||||||
|
ca_key = OpenSSL.crypto.load_privatekey(key)
|
||||||
|
req = OpenSSL.crypto.load_certificate_request(csr)
|
||||||
|
cert = OpenSSL.crypto.X509()
|
||||||
|
cert.set_subject(req.get_subject())
|
||||||
|
cert.set_serial_number(1)
|
||||||
|
cert.gmtime_adj_notBefore(0)
|
||||||
|
cert.gmtime_adj_notAfter(24 * 60 * 60)
|
||||||
|
cert.set_issuer(ca_cert.get_subject())
|
||||||
|
cert.set_pubkey(req.get_pubkey())
|
||||||
|
cert.sign(ca_key, "sha512")
|
||||||
|
#print OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, cert)
|
||||||
|
return(cert)
|
@ -3,12 +3,32 @@ import shutil
|
|||||||
import jinja2
|
import jinja2
|
||||||
import git
|
import git
|
||||||
import patch
|
import patch
|
||||||
import OpenSSL
|
|
||||||
import datetime
|
import datetime
|
||||||
|
import bSSL
|
||||||
|
|
||||||
|
|
||||||
def sslIPXE(conf):
|
def sslIPXE(conf):
|
||||||
|
try:
|
||||||
|
ca = conf['ipxe']['ssl_ca']
|
||||||
|
except:
|
||||||
|
ca = None
|
||||||
|
try:
|
||||||
|
cakey = conf['ipxe']['ssl_cakey']
|
||||||
|
except:
|
||||||
|
cakey = None
|
||||||
|
try:
|
||||||
|
crt = conf['ipxe']['ssl_crt']
|
||||||
|
except:
|
||||||
|
crt = None
|
||||||
|
try:
|
||||||
|
key = conf['ipxe']['ssl_key']
|
||||||
|
except:
|
||||||
|
key = None
|
||||||
# http://www.pyopenssl.org/en/stable/api/crypto.html#pkey-objects
|
# http://www.pyopenssl.org/en/stable/api/crypto.html#pkey-objects
|
||||||
|
# http://docs.ganeti.org/ganeti/2.14/html/design-x509-ca.html
|
||||||
|
if not cakey:
|
||||||
|
cakey = bSSL.sslCAKey
|
||||||
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def buildIPXE(conf):
|
def buildIPXE(conf):
|
||||||
@ -34,15 +54,17 @@ def buildIPXE(conf):
|
|||||||
eiso_commit = '189652b03032305a2db860e76fb58e81e3420c4d'
|
eiso_commit = '189652b03032305a2db860e76fb58e81e3420c4d'
|
||||||
nopie_commit = '58557055e51b2587ad3843af58075de916e5399b'
|
nopie_commit = '58557055e51b2587ad3843af58075de916e5399b'
|
||||||
# patch files
|
# patch files
|
||||||
#cwd = os.getcwd()
|
|
||||||
#os.chdir(ipxe_src + '/src')
|
|
||||||
for p in ('01.git-version.patch.j2', '02.banner.patch.j2'):
|
for p in ('01.git-version.patch.j2', '02.banner.patch.j2'):
|
||||||
try:
|
try:
|
||||||
patchfile = patch.fromfile(patches_dir + '/' + p)
|
patchfile = patch.fromfile(patches_dir + '/' + p)
|
||||||
patchfile.apply(strip = 2, root = ipxe_src + '/src')
|
patchfile.apply(strip = 2, root = ipxe_src + '/src')
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
#os.chdir(cwd)
|
|
||||||
# Patch using the files before applying the cherrypicks
|
# Patch using the files before applying the cherrypicks
|
||||||
ipxe_repo.git.cherry_pick('-n', eiso_commit)
|
ipxe_repo.git.cherry_pick('-n', eiso_commit)
|
||||||
ipxe_repo.git.cherry_pick('-n', nopie_commit)
|
ipxe_repo.git.cherry_pick('-n', nopie_commit)
|
||||||
|
# Now we make!
|
||||||
|
cwd = os.getcwd()
|
||||||
|
os.chdir(ipxe_src + '/src')
|
||||||
|
|
||||||
|
os.chdir(cwd)
|
||||||
|
@ -1,24 +1,24 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
|
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
|
||||||
<office:meta><meta:creation-date>2016-12-01T11:27:37.665510821</meta:creation-date><dc:date>2016-12-03T23:47:18.021215054</dc:date><meta:editing-duration>PT11H14M18S</meta:editing-duration><meta:editing-cycles>19</meta:editing-cycles><meta:generator>LibreOffice/5.2.3.3$Linux_X86_64 LibreOffice_project/20m0$Build-3</meta:generator><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:object-count="0" meta:page-count="3" meta:paragraph-count="27" meta:word-count="301" meta:character-count="1773" meta:non-whitespace-character-count="1483"/></office:meta>
|
<office:meta><meta:creation-date>2016-12-01T11:27:37.665510821</meta:creation-date><dc:date>2016-12-04T05:22:38.498441678</dc:date><meta:editing-duration>PT12H18M12S</meta:editing-duration><meta:editing-cycles>33</meta:editing-cycles><meta:generator>LibreOffice/5.2.3.3$Linux_X86_64 LibreOffice_project/20m0$Build-3</meta:generator><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:object-count="0" meta:page-count="5" meta:paragraph-count="49" meta:word-count="695" meta:character-count="4130" meta:non-whitespace-character-count="3475"/></office:meta>
|
||||||
<office:settings>
|
<office:settings>
|
||||||
<config:config-item-set config:name="ooo:view-settings">
|
<config:config-item-set config:name="ooo:view-settings">
|
||||||
<config:config-item config:name="ViewAreaTop" config:type="long">59055</config:config-item>
|
<config:config-item config:name="ViewAreaTop" config:type="long">96203</config:config-item>
|
||||||
<config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
|
<config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
|
||||||
<config:config-item config:name="ViewAreaWidth" config:type="long">40748</config:config-item>
|
<config:config-item config:name="ViewAreaWidth" config:type="long">40748</config:config-item>
|
||||||
<config:config-item config:name="ViewAreaHeight" config:type="long">21751</config:config-item>
|
<config:config-item config:name="ViewAreaHeight" config:type="long">20719</config:config-item>
|
||||||
<config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
|
<config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
|
||||||
<config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
|
<config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
|
||||||
<config:config-item-map-indexed config:name="Views">
|
<config:config-item-map-indexed config:name="Views">
|
||||||
<config:config-item-map-entry>
|
<config:config-item-map-entry>
|
||||||
<config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
|
<config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
|
||||||
<config:config-item config:name="ViewLeft" config:type="long">14079</config:config-item>
|
<config:config-item config:name="ViewLeft" config:type="long">14942</config:config-item>
|
||||||
<config:config-item config:name="ViewTop" config:type="long">77479</config:config-item>
|
<config:config-item config:name="ViewTop" config:type="long">106932</config:config-item>
|
||||||
<config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
|
<config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
|
||||||
<config:config-item config:name="VisibleTop" config:type="long">59055</config:config-item>
|
<config:config-item config:name="VisibleTop" config:type="long">96203</config:config-item>
|
||||||
<config:config-item config:name="VisibleRight" config:type="long">40746</config:config-item>
|
<config:config-item config:name="VisibleRight" config:type="long">40746</config:config-item>
|
||||||
<config:config-item config:name="VisibleBottom" config:type="long">80804</config:config-item>
|
<config:config-item config:name="VisibleBottom" config:type="long">116919</config:config-item>
|
||||||
<config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
|
<config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
|
||||||
<config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item>
|
<config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item>
|
||||||
<config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
|
<config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
|
||||||
@ -69,7 +69,7 @@
|
|||||||
<config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
|
<config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
|
||||||
<config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
|
<config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
|
||||||
<config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
|
<config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
|
||||||
<config:config-item config:name="Rsid" config:type="int">396750</config:config-item>
|
<config:config-item config:name="Rsid" config:type="int">947814</config:config-item>
|
||||||
<config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
|
<config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
|
||||||
<config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item>
|
<config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item>
|
||||||
<config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item>
|
<config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item>
|
||||||
@ -122,6 +122,7 @@
|
|||||||
</office:script>
|
</office:script>
|
||||||
</office:scripts>
|
</office:scripts>
|
||||||
<office:font-face-decls>
|
<office:font-face-decls>
|
||||||
|
<style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol" style:font-charset="x-symbol"/>
|
||||||
<style:font-face style:name="FreeSans1" svg:font-family="FreeSans" style:font-family-generic="swiss"/>
|
<style:font-face style:name="FreeSans1" svg:font-family="FreeSans" style:font-family-generic="swiss"/>
|
||||||
<style:font-face style:name="DejaVu Serif" svg:font-family="'DejaVu Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
|
<style:font-face style:name="DejaVu Serif" svg:font-family="'DejaVu Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
|
||||||
<style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
|
<style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
|
||||||
@ -235,13 +236,24 @@
|
|||||||
<style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0.1965in" style:auto-text-indent="false"/>
|
<style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0.1965in" style:auto-text-indent="false"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="Horizontal_20_Line" style:display-name="Horizontal Line" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="html">
|
<style:style style:name="Horizontal_20_Line" style:display-name="Horizontal Line" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="html">
|
||||||
<style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.1965in" loext:contextual-spacing="false" style:border-line-width-bottom="0in 0.0016in 0.0008in" fo:padding="0in" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.06pt double #808080" text:number-lines="false" text:line-number="0" style:join-border="false"/>
|
<style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.1965in" loext:contextual-spacing="false" style:border-line-width-bottom="0in 0.0016in 0.0008in" fo:padding="0in" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.14pt double #808080" text:number-lines="false" text:line-number="0" style:join-border="false"/>
|
||||||
<style:text-properties fo:font-size="6pt" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
|
<style:text-properties fo:font-size="6pt" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
|
<style:style style:name="Footnote" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
|
||||||
|
<style:paragraph-properties fo:margin-left="0.2354in" fo:margin-right="0in" fo:text-indent="-0.2354in" style:auto-text-indent="false" text:number-lines="false" text:line-number="0"/>
|
||||||
|
<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
|
||||||
|
</style:style>
|
||||||
<style:style style:name="Internet_20_link" style:display-name="Internet link" style:family="text">
|
<style:style style:name="Internet_20_link" style:display-name="Internet link" style:family="text">
|
||||||
<style:text-properties fo:color="#000000" fo:language="zxx" fo:country="none" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:language-complex="zxx" style:country-complex="none"/>
|
<style:text-properties fo:color="#000000" fo:language="zxx" fo:country="none" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:language-complex="zxx" style:country-complex="none"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="Index_20_Link" style:display-name="Index Link" style:family="text"/>
|
<style:style style:name="Index_20_Link" style:display-name="Index Link" style:family="text"/>
|
||||||
|
<style:style style:name="Footnote_20_Symbol" style:display-name="Footnote Symbol" style:family="text"/>
|
||||||
|
<style:style style:name="Footnote_20_anchor" style:display-name="Footnote anchor" style:family="text">
|
||||||
|
<style:text-properties style:text-position="super 58%"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="Bullet_20_Symbols" style:display-name="Bullet Symbols" style:family="text">
|
||||||
|
<style:text-properties style:font-name="OpenSymbol" fo:font-family="OpenSymbol" style:font-charset="x-symbol" style:font-name-asian="OpenSymbol" style:font-family-asian="OpenSymbol" style:font-charset-asian="x-symbol" style:font-name-complex="OpenSymbol" style:font-family-complex="OpenSymbol" style:font-charset-complex="x-symbol"/>
|
||||||
|
</style:style>
|
||||||
<style:style style:name="Frame" style:family="graphic">
|
<style:style style:name="Frame" style:family="graphic">
|
||||||
<style:graphic-properties text:anchor-type="paragraph" svg:x="0in" svg:y="0in" fo:margin-left="0.0791in" fo:margin-right="0.0791in" fo:margin-top="0.0791in" fo:margin-bottom="0.0791in" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:padding="0.0591in" fo:border="0.06pt solid #000000"/>
|
<style:graphic-properties text:anchor-type="paragraph" svg:x="0in" svg:y="0in" fo:margin-left="0.0791in" fo:margin-right="0.0791in" fo:margin-top="0.0791in" fo:margin-bottom="0.0791in" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:padding="0.0591in" fo:border="0.06pt solid #000000"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
@ -297,7 +309,7 @@
|
|||||||
</style:list-level-properties>
|
</style:list-level-properties>
|
||||||
</text:outline-level-style>
|
</text:outline-level-style>
|
||||||
</text:outline-style>
|
</text:outline-style>
|
||||||
<text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
|
<text:notes-configuration text:note-class="footnote" text:citation-style-name="Footnote_20_Symbol" text:citation-body-style-name="Footnote_20_anchor" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
|
||||||
<text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
|
<text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
|
||||||
<text:linenumbering-configuration text:number-lines="false" text:offset="0.1965in" style:num-format="1" text:number-position="left" text:increment="5"/>
|
<text:linenumbering-configuration text:number-lines="false" text:offset="0.1965in" style:num-format="1" text:number-position="left" text:increment="5"/>
|
||||||
</office:styles>
|
</office:styles>
|
||||||
@ -322,96 +334,230 @@
|
|||||||
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P7" style:family="paragraph" style:parent-style-name="Text_20_body">
|
<style:style style:name="P7" style:family="paragraph" style:parent-style-name="Text_20_body">
|
||||||
<style:text-properties officeooo:paragraph-rsid="0002592b"/>
|
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="00074189"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P8" style:family="paragraph" style:parent-style-name="Text_20_body">
|
<style:style style:name="P8" style:family="paragraph" style:parent-style-name="Text_20_body">
|
||||||
|
<style:text-properties officeooo:paragraph-rsid="0002592b"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P9" style:family="paragraph" style:parent-style-name="Text_20_body">
|
||||||
<style:text-properties officeooo:paragraph-rsid="0003d8d6"/>
|
<style:text-properties officeooo:paragraph-rsid="0003d8d6"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P9" style:family="paragraph" style:parent-style-name="Title" style:master-page-name="">
|
<style:style style:name="P10" style:family="paragraph" style:parent-style-name="Text_20_body">
|
||||||
|
<style:text-properties officeooo:paragraph-rsid="0004d562"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P11" style:family="paragraph" style:parent-style-name="Title" style:master-page-name="">
|
||||||
<loext:graphic-properties draw:fill="none"/>
|
<loext:graphic-properties draw:fill="none"/>
|
||||||
<style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.1665in" fo:margin-bottom="0.0835in" loext:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false" style:page-number="auto" fo:background-color="transparent" fo:keep-with-next="always"/>
|
<style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.1665in" fo:margin-bottom="0.0835in" loext:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false" style:page-number="auto" fo:background-color="transparent" fo:keep-with-next="always"/>
|
||||||
<style:text-properties officeooo:rsid="0000966e" officeooo:paragraph-rsid="0000966e"/>
|
<style:text-properties officeooo:rsid="0000966e" officeooo:paragraph-rsid="0000966e"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P10" style:family="paragraph" style:parent-style-name="Subtitle">
|
<style:style style:name="P12" style:family="paragraph" style:parent-style-name="Subtitle">
|
||||||
<style:text-properties officeooo:rsid="000165f1" officeooo:paragraph-rsid="000165f1"/>
|
<style:text-properties officeooo:rsid="000165f1" officeooo:paragraph-rsid="000165f1"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
|
<style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
|
||||||
<style:text-properties officeooo:rsid="0000966e" officeooo:paragraph-rsid="0000966e"/>
|
<style:text-properties officeooo:rsid="0000966e" officeooo:paragraph-rsid="0000966e"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="First_20_Page">
|
<style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
|
||||||
<style:paragraph-properties style:page-number="auto"/>
|
<style:paragraph-properties style:page-number="auto"/>
|
||||||
<style:text-properties officeooo:rsid="0000966e" officeooo:paragraph-rsid="0000966e"/>
|
<style:text-properties officeooo:rsid="0000966e" officeooo:paragraph-rsid="0000966e"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P13" style:family="paragraph" style:parent-style-name="Text_20_body">
|
<style:style style:name="P15" style:family="paragraph" style:parent-style-name="Contents_20_Heading">
|
||||||
<style:text-properties officeooo:paragraph-rsid="0004d562"/>
|
|
||||||
</style:style>
|
|
||||||
<style:style style:name="P14" style:family="paragraph" style:parent-style-name="Contents_20_Heading">
|
|
||||||
<style:paragraph-properties fo:break-before="page"/>
|
<style:paragraph-properties fo:break-before="page"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P15" style:family="paragraph" style:parent-style-name="Heading_20_1">
|
<style:style style:name="P16" style:family="paragraph" style:parent-style-name="Heading_20_1">
|
||||||
<style:paragraph-properties fo:break-before="page"/>
|
<style:paragraph-properties fo:break-before="page"/>
|
||||||
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P16" style:family="paragraph" style:parent-style-name="Heading_20_2">
|
|
||||||
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
|
||||||
</style:style>
|
|
||||||
<style:style style:name="P17" style:family="paragraph" style:parent-style-name="Heading_20_2">
|
<style:style style:name="P17" style:family="paragraph" style:parent-style-name="Heading_20_2">
|
||||||
|
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P18" style:family="paragraph" style:parent-style-name="Heading_20_2">
|
||||||
<style:text-properties officeooo:paragraph-rsid="0002592b"/>
|
<style:text-properties officeooo:paragraph-rsid="0002592b"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P18" style:family="paragraph" style:parent-style-name="Contents_20_1">
|
<style:style style:name="P19" style:family="paragraph" style:parent-style-name="Contents_20_1">
|
||||||
<style:paragraph-properties>
|
<style:paragraph-properties>
|
||||||
<style:tab-stops>
|
<style:tab-stops>
|
||||||
<style:tab-stop style:position="6.9252in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
<style:tab-stop style:position="6.9252in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
||||||
</style:tab-stops>
|
</style:tab-stops>
|
||||||
</style:paragraph-properties>
|
</style:paragraph-properties>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P19" style:family="paragraph" style:parent-style-name="Heading_20_3">
|
<style:style style:name="P20" style:family="paragraph" style:parent-style-name="Heading_20_3">
|
||||||
<style:text-properties officeooo:rsid="0004d562" officeooo:paragraph-rsid="0004d562"/>
|
<style:text-properties officeooo:rsid="0004d562" officeooo:paragraph-rsid="0004d562"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P20" style:family="paragraph" style:parent-style-name="Contents_20_2">
|
<style:style style:name="P21" style:family="paragraph" style:parent-style-name="Contents_20_2">
|
||||||
<style:paragraph-properties>
|
<style:paragraph-properties>
|
||||||
<style:tab-stops>
|
<style:tab-stops>
|
||||||
<style:tab-stop style:position="6.7283in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
<style:tab-stop style:position="6.7283in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
||||||
</style:tab-stops>
|
</style:tab-stops>
|
||||||
</style:paragraph-properties>
|
</style:paragraph-properties>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="P21" style:family="paragraph" style:parent-style-name="Contents_20_3">
|
<style:style style:name="P22" style:family="paragraph" style:parent-style-name="Contents_20_3">
|
||||||
<style:paragraph-properties>
|
<style:paragraph-properties>
|
||||||
<style:tab-stops>
|
<style:tab-stops>
|
||||||
<style:tab-stop style:position="6.5319in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
<style:tab-stop style:position="6.5319in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
||||||
</style:tab-stops>
|
</style:tab-stops>
|
||||||
</style:paragraph-properties>
|
</style:paragraph-properties>
|
||||||
</style:style>
|
</style:style>
|
||||||
|
<style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="First_20_Page">
|
||||||
|
<style:paragraph-properties style:page-number="auto"/>
|
||||||
|
<style:text-properties officeooo:rsid="0000966e" officeooo:paragraph-rsid="0000966e"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P24" style:family="paragraph" style:parent-style-name="Text_20_body">
|
||||||
|
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P25" style:family="paragraph" style:parent-style-name="Text_20_body">
|
||||||
|
<style:text-properties officeooo:paragraph-rsid="000d91dc"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P26" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L1">
|
||||||
|
<style:text-properties officeooo:paragraph-rsid="000d91dc"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P27" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L1">
|
||||||
|
<style:text-properties officeooo:rsid="000d91dc" officeooo:paragraph-rsid="000d91dc"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P28" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L1">
|
||||||
|
<style:text-properties officeooo:rsid="000e7666" officeooo:paragraph-rsid="000e7666"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P29" style:family="paragraph" style:parent-style-name="Heading_20_2">
|
||||||
|
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P30" style:family="paragraph" style:parent-style-name="Contents_20_Heading">
|
||||||
|
<style:paragraph-properties fo:break-before="page"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P31" style:family="paragraph" style:parent-style-name="Heading_20_1">
|
||||||
|
<style:paragraph-properties fo:break-before="page"/>
|
||||||
|
<style:text-properties officeooo:rsid="0002592b" officeooo:paragraph-rsid="0002592b"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P32" style:family="paragraph" style:parent-style-name="Contents_20_1">
|
||||||
|
<style:paragraph-properties>
|
||||||
|
<style:tab-stops>
|
||||||
|
<style:tab-stop style:position="6.9252in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
||||||
|
</style:tab-stops>
|
||||||
|
</style:paragraph-properties>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P33" style:family="paragraph" style:parent-style-name="Heading_20_3">
|
||||||
|
<style:text-properties officeooo:rsid="0004d562" officeooo:paragraph-rsid="0004d562"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P34" style:family="paragraph" style:parent-style-name="Contents_20_3">
|
||||||
|
<style:paragraph-properties>
|
||||||
|
<style:tab-stops>
|
||||||
|
<style:tab-stop style:position="6.5319in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
||||||
|
</style:tab-stops>
|
||||||
|
</style:paragraph-properties>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P35" style:family="paragraph" style:parent-style-name="Contents_20_2">
|
||||||
|
<style:paragraph-properties>
|
||||||
|
<style:tab-stops>
|
||||||
|
<style:tab-stop style:position="6.7283in" style:type="right" style:leader-style="dotted" style:leader-text="."/>
|
||||||
|
</style:tab-stops>
|
||||||
|
</style:paragraph-properties>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="P36" style:family="paragraph" style:parent-style-name="Footnote">
|
||||||
|
<style:text-properties fo:font-weight="bold" officeooo:rsid="00087adf" officeooo:paragraph-rsid="00087adf" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
|
||||||
|
</style:style>
|
||||||
<style:style style:name="T1" style:family="text">
|
<style:style style:name="T1" style:family="text">
|
||||||
<style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
|
<style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T2" style:family="text">
|
<style:style style:name="T2" style:family="text">
|
||||||
<style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
|
<style:text-properties fo:font-weight="bold" officeooo:rsid="00074189" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T3" style:family="text">
|
<style:style style:name="T3" style:family="text">
|
||||||
<style:text-properties fo:font-weight="normal" officeooo:rsid="0003d8d6" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
|
<style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T4" style:family="text">
|
<style:style style:name="T4" style:family="text">
|
||||||
<style:text-properties fo:font-weight="normal" officeooo:rsid="0004d562" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
|
<style:text-properties fo:font-weight="normal" officeooo:rsid="0003d8d6" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T5" style:family="text">
|
<style:style style:name="T5" style:family="text">
|
||||||
<style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/>
|
<style:text-properties fo:font-weight="normal" officeooo:rsid="0004d562" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T6" style:family="text">
|
<style:style style:name="T6" style:family="text">
|
||||||
<style:text-properties fo:font-style="italic" officeooo:rsid="0003d8d6" style:font-style-asian="italic" style:font-style-complex="italic"/>
|
<style:text-properties fo:font-weight="normal" officeooo:rsid="00074189" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T7" style:family="text">
|
<style:style style:name="T7" style:family="text">
|
||||||
<style:text-properties fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal"/>
|
<style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T8" style:family="text">
|
<style:style style:name="T8" style:family="text">
|
||||||
<style:text-properties fo:font-style="normal" officeooo:rsid="0003d8d6" style:font-style-asian="normal" style:font-style-complex="normal"/>
|
<style:text-properties fo:font-style="italic" officeooo:rsid="0003d8d6" style:font-style-asian="italic" style:font-style-complex="italic"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T9" style:family="text">
|
<style:style style:name="T9" style:family="text">
|
||||||
<style:text-properties officeooo:rsid="0002592b"/>
|
<style:text-properties fo:font-style="italic" officeooo:rsid="00074189" style:font-style-asian="italic" style:font-style-complex="italic"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
<style:style style:name="T10" style:family="text">
|
<style:style style:name="T10" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="italic" officeooo:rsid="00087adf" style:font-style-asian="italic" style:font-style-complex="italic"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T11" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="italic" officeooo:rsid="000d91dc" style:font-style-asian="italic" style:font-style-complex="italic"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T12" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="italic" fo:font-weight="bold" officeooo:rsid="00087adf" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-style-complex="italic" style:font-weight-complex="bold"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T13" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="italic" fo:font-weight="bold" officeooo:rsid="000d91dc" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-style-complex="italic" style:font-weight-complex="bold"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T14" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="italic" fo:font-weight="normal" style:font-style-asian="italic" style:font-weight-asian="normal" style:font-style-complex="italic" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T15" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="italic" fo:font-weight="normal" officeooo:rsid="00087adf" style:font-style-asian="italic" style:font-weight-asian="normal" style:font-style-complex="italic" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T16" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="italic" style:text-underline-style="none" fo:font-weight="normal" style:font-style-asian="italic" style:font-weight-asian="normal" style:font-style-complex="italic" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T17" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T18" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" officeooo:rsid="0003d8d6" style:font-style-asian="normal" style:font-style-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T19" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" officeooo:rsid="00074189" style:font-style-asian="normal" style:font-style-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T20" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" officeooo:rsid="00087adf" style:font-style-asian="normal" style:font-style-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T21" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" officeooo:rsid="000d91dc" style:font-style-asian="normal" style:font-style-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T22" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" fo:font-weight="bold" officeooo:rsid="00087adf" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-style-complex="normal" style:font-weight-complex="bold"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T23" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" fo:font-weight="bold" officeooo:rsid="000e7666" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-style-complex="normal" style:font-weight-complex="bold"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T24" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" fo:font-weight="normal" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-style-complex="normal" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T25" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" fo:font-weight="normal" officeooo:rsid="00087adf" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-style-complex="normal" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T26" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" fo:font-weight="normal" officeooo:rsid="000d91dc" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-style-complex="normal" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T27" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" fo:font-weight="normal" officeooo:rsid="000e7666" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-style-complex="normal" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T28" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="normal" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-style-complex="normal" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T29" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-style-complex="normal" style:font-weight-complex="bold"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T30" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-style-complex="normal" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T31" style:family="text">
|
||||||
|
<style:text-properties fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000e7666" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-style-complex="normal" style:font-weight-complex="normal"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T32" style:family="text">
|
||||||
|
<style:text-properties officeooo:rsid="0002592b"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T33" style:family="text">
|
||||||
<style:text-properties officeooo:rsid="0004d562"/>
|
<style:text-properties officeooo:rsid="0004d562"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
|
<style:style style:name="T34" style:family="text">
|
||||||
|
<style:text-properties officeooo:rsid="00074189"/>
|
||||||
|
</style:style>
|
||||||
|
<style:style style:name="T35" style:family="text">
|
||||||
|
<style:text-properties officeooo:rsid="00087adf"/>
|
||||||
|
</style:style>
|
||||||
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Frame">
|
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Frame">
|
||||||
<style:graphic-properties style:vertical-pos="middle" style:vertical-rel="page-content" style:horizontal-pos="from-left" style:horizontal-rel="page" fo:padding="0in" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
|
<style:graphic-properties style:vertical-pos="middle" style:vertical-rel="page-content" style:horizontal-pos="from-left" style:horizontal-rel="page" fo:padding="0in" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
|
||||||
</style:style>
|
</style:style>
|
||||||
@ -420,6 +566,58 @@
|
|||||||
<style:columns fo:column-count="1" fo:column-gap="0in"/>
|
<style:columns fo:column-count="1" fo:column-gap="0in"/>
|
||||||
</style:section-properties>
|
</style:section-properties>
|
||||||
</style:style>
|
</style:style>
|
||||||
|
<text:list-style style:name="L1">
|
||||||
|
<text:list-level-style-bullet text:level="1" text:style-name="Bullet_20_Symbols" text:bullet-char="•">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.5in" fo:text-indent="-0.25in" fo:margin-left="0.5in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="2" text:style-name="Bullet_20_Symbols" text:bullet-char="◦">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.75in" fo:text-indent="-0.25in" fo:margin-left="0.75in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="3" text:style-name="Bullet_20_Symbols" text:bullet-char="▪">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1in" fo:text-indent="-0.25in" fo:margin-left="1in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="4" text:style-name="Bullet_20_Symbols" text:bullet-char="•">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.25in" fo:text-indent="-0.25in" fo:margin-left="1.25in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="5" text:style-name="Bullet_20_Symbols" text:bullet-char="◦">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.5in" fo:text-indent="-0.25in" fo:margin-left="1.5in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="6" text:style-name="Bullet_20_Symbols" text:bullet-char="▪">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.75in" fo:text-indent="-0.25in" fo:margin-left="1.75in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="7" text:style-name="Bullet_20_Symbols" text:bullet-char="•">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2in" fo:text-indent="-0.25in" fo:margin-left="2in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="8" text:style-name="Bullet_20_Symbols" text:bullet-char="◦">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.25in" fo:text-indent="-0.25in" fo:margin-left="2.25in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="9" text:style-name="Bullet_20_Symbols" text:bullet-char="▪">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.5in" fo:text-indent="-0.25in" fo:margin-left="2.5in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
<text:list-level-style-bullet text:level="10" text:style-name="Bullet_20_Symbols" text:bullet-char="•">
|
||||||
|
<style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
|
||||||
|
<style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.75in" fo:text-indent="-0.25in" fo:margin-left="2.75in"/>
|
||||||
|
</style:list-level-properties>
|
||||||
|
</text:list-level-style-bullet>
|
||||||
|
</text:list-style>
|
||||||
<style:page-layout style:name="pm1">
|
<style:page-layout style:name="pm1">
|
||||||
<style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:footnote-max-height="0in">
|
<style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:footnote-max-height="0in">
|
||||||
<style:footnote-sep style:width="0.0071in" style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
|
<style:footnote-sep style:width="0.0071in" style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
|
||||||
@ -451,12 +649,12 @@
|
|||||||
<office:master-styles>
|
<office:master-styles>
|
||||||
<style:master-page style:name="Standard" style:page-layout-name="pm1">
|
<style:master-page style:name="Standard" style:page-layout-name="pm1">
|
||||||
<style:footer>
|
<style:footer>
|
||||||
<text:p text:style-name="P1">BDisk Manual<text:tab/><text:tab/>Page <text:page-number text:select-page="current">2</text:page-number> of <text:page-count>3</text:page-count></text:p>
|
<text:p text:style-name="P1">BDisk Manual<text:tab/><text:tab/>Page <text:page-number text:select-page="current">5</text:page-number> of <text:page-count>5</text:page-count></text:p>
|
||||||
</style:footer>
|
</style:footer>
|
||||||
</style:master-page>
|
</style:master-page>
|
||||||
<style:master-page style:name="First_20_Page" style:display-name="First Page" style:page-layout-name="pm2" style:next-style-name="Standard">
|
<style:master-page style:name="First_20_Page" style:display-name="First Page" style:page-layout-name="pm2" style:next-style-name="Standard">
|
||||||
<style:header>
|
<style:header>
|
||||||
<text:p text:style-name="P2"><text:modification-date style:data-style-name="N79">Saturday, December 3, 2016</text:modification-date></text:p>
|
<text:p text:style-name="P2"><text:modification-date style:data-style-name="N79">Sunday, December 4, 2016</text:modification-date></text:p>
|
||||||
</style:header>
|
</style:header>
|
||||||
</style:master-page>
|
</style:master-page>
|
||||||
</office:master-styles>
|
</office:master-styles>
|
||||||
@ -470,18 +668,18 @@
|
|||||||
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
|
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
|
||||||
</text:sequence-decls><draw:frame draw:style-name="fr1" draw:name="Frame1" text:anchor-type="page" text:anchor-page-number="1" svg:x="1in" svg:width="6.4374in" draw:z-index="0">
|
</text:sequence-decls><draw:frame draw:style-name="fr1" draw:name="Frame1" text:anchor-type="page" text:anchor-page-number="1" svg:x="1in" svg:width="6.4374in" draw:z-index="0">
|
||||||
<draw:text-box fo:min-height="0.2in">
|
<draw:text-box fo:min-height="0.2in">
|
||||||
<text:p text:style-name="P9">BDISK</text:p>
|
<text:p text:style-name="P11">BDISK</text:p>
|
||||||
<text:p text:style-name="P10">Manual v1.0</text:p>
|
<text:p text:style-name="P12">Manual v1.0</text:p>
|
||||||
<text:p text:style-name="P5">Brent Saner</text:p>
|
<text:p text:style-name="P5">Brent Saner</text:p>
|
||||||
<text:p text:style-name="P5"><text:a xlink:type="simple" xlink:href="mailto:bts@square-r00t.net?subject=BDisk%20Manual" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">bts@square-r00t.net</text:a></text:p>
|
<text:p text:style-name="P5"><text:a xlink:type="simple" xlink:href="mailto:bts@square-r00t.net?subject=BDisk%20Manual" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">bts@square-r00t.net</text:a></text:p>
|
||||||
</draw:text-box>
|
</draw:text-box>
|
||||||
</draw:frame>
|
</draw:frame>
|
||||||
<text:p text:style-name="P12"/>
|
<text:p text:style-name="P23"/>
|
||||||
<text:table-of-content text:style-name="Sect1" text:protected="true" text:name="Table of Contents1">
|
<text:table-of-content text:style-name="Sect1" text:protected="true" text:name="Table of Contents1">
|
||||||
<text:table-of-content-source text:outline-level="10">
|
<text:table-of-content-source text:outline-level="10">
|
||||||
<text:index-title-template text:style-name="Contents_20_Heading">Table of Contents</text:index-title-template>
|
<text:index-title-template text:style-name="Contents_20_Heading">Table of Contents</text:index-title-template>
|
||||||
<text:table-of-content-entry-template text:outline-level="1" text:style-name="Contents_20_1">
|
<text:table-of-content-entry-template text:outline-level="1" text:style-name="Contents_20_1">
|
||||||
<text:index-entry-link-start text:style-name="Default_20_Style"/>
|
<text:index-entry-link-start/>
|
||||||
<text:index-entry-chapter/>
|
<text:index-entry-chapter/>
|
||||||
<text:index-entry-text/>
|
<text:index-entry-text/>
|
||||||
<text:index-entry-tab-stop style:type="right" style:leader-char="."/>
|
<text:index-entry-tab-stop style:type="right" style:leader-char="."/>
|
||||||
@ -563,32 +761,90 @@
|
|||||||
</text:table-of-content-source>
|
</text:table-of-content-source>
|
||||||
<text:index-body>
|
<text:index-body>
|
||||||
<text:index-title text:style-name="Sect1" text:name="Table of Contents1_Head">
|
<text:index-title text:style-name="Sect1" text:name="Table of Contents1_Head">
|
||||||
<text:p text:style-name="P14">Table of Contents</text:p>
|
<text:p text:style-name="P15">Table of Contents</text:p>
|
||||||
</text:index-title>
|
</text:index-title>
|
||||||
<text:p text:style-name="P18"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc237_1260022884" text:style-name="Default_20_Style" text:visited-style-name="Default_20_Style">Chapter I: Introduction<text:tab/>3</text:a></text:p>
|
<text:p text:style-name="P32"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc237_1260022884">Chapter I: Introduction<text:tab/>3</text:a></text:p>
|
||||||
<text:p text:style-name="P20"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc254_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.1: What is BDisk?<text:tab/>3</text:a></text:p>
|
<text:p text:style-name="P35"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc254_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.1: What is BDisk?<text:tab/>3</text:a></text:p>
|
||||||
<text:p text:style-name="P20"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc379_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.2: Who wrote it?<text:tab/>3</text:a></text:p>
|
<text:p text:style-name="P35"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc379_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.2: Who wrote it?<text:tab/>3</text:a></text:p>
|
||||||
<text:p text:style-name="P20"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc256_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.3: What is this document?<text:tab/>3</text:a></text:p>
|
<text:p text:style-name="P35"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc256_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.3: What is this document?<text:tab/>3</text:a></text:p>
|
||||||
<text:p text:style-name="P20"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc173_449581326" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.4: Conventions used in this document<text:tab/>3</text:a></text:p>
|
<text:p text:style-name="P34"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc173_449581326" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">I.3.i: Conventions used in this document<text:tab/>3</text:a></text:p>
|
||||||
<text:p text:style-name="P20"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc258_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.5: Further information/resources<text:tab/>3</text:a></text:p>
|
<text:p text:style-name="P35"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc258_1260022884" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link"><text:s/>Section I.4: Further information/resources<text:tab/>3</text:a></text:p>
|
||||||
<text:p text:style-name="P21"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc175_449581326" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">I.5.i: For Developers<text:tab/>3</text:a></text:p>
|
<text:p text:style-name="P34"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc220_1657685180" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">I.4.i: For Users<text:tab/>3</text:a></text:p>
|
||||||
|
<text:p text:style-name="P34"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc175_449581326" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">I.4.ii: For Developers<text:tab/>4</text:a></text:p>
|
||||||
|
<text:p text:style-name="P32"><text:a xlink:type="simple" xlink:href="#__RefHeading___Toc232_667539389">Chapter II: Getting Started<text:tab/>4</text:a></text:p>
|
||||||
</text:index-body>
|
</text:index-body>
|
||||||
</text:table-of-content>
|
</text:table-of-content>
|
||||||
<text:p text:style-name="P11"/>
|
<text:p text:style-name="P13"/>
|
||||||
<text:h text:style-name="P15" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc237_1260022884"/>Introduction<text:bookmark-end text:name="__RefHeading___Toc237_1260022884"/></text:h>
|
<text:h text:style-name="P16" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc237_1260022884"/>Introduction<text:bookmark-end text:name="__RefHeading___Toc237_1260022884"/></text:h>
|
||||||
<text:h text:style-name="P16" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc254_1260022884"/>What is BDisk?<text:bookmark-end text:name="__RefHeading___Toc254_1260022884"/></text:h>
|
<text:h text:style-name="P17" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc254_1260022884"/>What is BDisk?<text:bookmark-end text:name="__RefHeading___Toc254_1260022884"/></text:h>
|
||||||
<text:p text:style-name="P6"><text:tab/>BDisk refers to both a live distribution I use in my own uses (for rescue situations, recovery, etc.) but foremost and most importantly, it refers to the tool I use for <text:span text:style-name="T1">building</text:span><text:span text:style-name="T2"> that distribution. This is what this project and documentation refer to when the word “BDisk” is used.</text:span></text:p>
|
<text:p text:style-name="P6"><text:tab/>BDisk refers to both a live distribution I use in my own uses (for rescue situations, recovery, etc.) but foremost and most importantly, it refers to the tool I use for <text:span text:style-name="T1">building</text:span><text:span text:style-name="T3"> that distribution. This is what this project and documentation refer to when the word “BDisk” is used.</text:span></text:p>
|
||||||
<text:p text:style-name="First_20_line_20_indent"><text:tab/>BDisk is <text:a xlink:type="simple" xlink:href="https://www.gnu.org/licenses/gpl-3.0.en.html" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">GPLv3</text:a>-licensed. This means that you can use it for business reasons, personal reasons, modify it, etc. There are a few restrictions I retain, however, on this (don’t worry; they’re all in line with the GPLv3). You can find the full license in <text:span text:style-name="T1">docs/LICENSE</text:span>.</text:p>
|
<text:p text:style-name="First_20_line_20_indent"><text:tab/>BDisk is <text:a xlink:type="simple" xlink:href="https://www.gnu.org/licenses/gpl-3.0.en.html" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">GPLv3</text:a>-licensed. This means that you can use it for business reasons, personal reasons, modify it, etc. There are a few restrictions I retain, however, on this (don’t worry; they’re all in line with the GPLv3). You can find the full license in <text:span text:style-name="T1">docs/LICENSE</text:span>.</text:p>
|
||||||
<text:h text:style-name="P16" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc379_1260022884"/>Who wrote it?<text:bookmark-end text:name="__RefHeading___Toc379_1260022884"/></text:h>
|
<text:p text:style-name="P7"><text:span text:style-name="T18"><text:tab/></text:span><text:span text:style-name="T19">When I rewrote BDisk in Python 3.x (I should take the time to note that I am still quite new to python so expect there to be plenty of optimizations to be made and general WTF-ery from seasoned python developers), one of my main goals was to make it as easy to use as possible. This is surprisingly hard to do- it’s quite challenging to try to approach software you’ve written with the mindset of someone other than you. Please see </text:span><text:span text:style-name="T20">the</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T9"><text:bookmark-ref text:reference-format="text" text:ref-name="__RefHeading___Toc220_1657685180">For Users</text:bookmark-ref></text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T20">section (</text:span><text:span text:style-name="T20"><text:bookmark-ref text:reference-format="chapter" text:ref-name="__RefHeading___Toc220_1657685180">I.4.i</text:bookmark-ref></text:span><text:span text:style-name="T20">).</text:span></text:p>
|
||||||
<text:p text:style-name="P6"><text:tab/>I (Brent Saner) am a GNU/Linux Systems/Network Administrator/Engineer- I wear a lot of hats. I have a lot of side projects to keep me busy when I’m not working at <text:span text:style-name="T5">${dayjob}</text:span><text:span text:style-name="T7">, </text:span><text:span text:style-name="T8">mostly to assist in </text:span><text:span text:style-name="T6">other</text:span><text:span text:style-name="T8"> side projects and become more efficient and proficient.</text:span></text:p>
|
<text:h text:style-name="P17" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc379_1260022884"/>Who wrote it?<text:bookmark-end text:name="__RefHeading___Toc379_1260022884"/></text:h>
|
||||||
<text:h text:style-name="P17" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc256_1260022884"/><text:span text:style-name="T9">What is this document?</text:span><text:bookmark-end text:name="__RefHeading___Toc256_1260022884"/></text:h>
|
<text:p text:style-name="P6"><text:tab/>I (Brent Saner) am a GNU/Linux Systems/Network Administrator/Engineer- I wear a lot of hats. I have a lot of side projects to keep me busy when I’m not working at <text:span text:style-name="T7">${dayjob}</text:span><text:span text:style-name="T17">, </text:span><text:span text:style-name="T18">mostly to assist in </text:span><text:span text:style-name="T8">other</text:span><text:span text:style-name="T18"> side projects and become more efficient and proficient </text:span><text:span text:style-name="T19">at those tasks. “</text:span><text:a xlink:type="simple" xlink:href="http://catb.org/jargon/html/Y/yak-shaving.html" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link"><text:span text:style-name="T19">Shaving the yak</text:span></text:a><text:span text:style-name="T19">,” indeed.</text:span></text:p>
|
||||||
<text:h text:style-name="P16" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc173_449581326"/>Conventions used in this document<text:bookmark-end text:name="__RefHeading___Toc173_449581326"/></text:h>
|
<text:p text:style-name="P6"><text:span text:style-name="T19"><text:tab/></text:span><text:span text:style-name="T20">I did a lot of research into how low-level boot operations take place, both in BIOS and UEFI</text:span><text:span text:style-name="T20"><text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body>
|
||||||
<text:h text:style-name="P16" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc258_1260022884"/>Further information/resources<text:bookmark-end text:name="__RefHeading___Toc258_1260022884"/></text:h>
|
<text:p text:style-name="P36">Unified Extensible Firmware Interface<text:span text:style-name="T3">. UEFI </text:span><text:span text:style-name="T14">is not</text:span><text:span text:style-name="T24"> BIOS, and BIOS </text:span><text:span text:style-name="T14">is not</text:span><text:span text:style-name="T24"> UEFI.</text:span></text:p></text:note-body></text:note></text:span><text:span text:style-name="T20"> (and corresponding concepts such as Secureboot, etc.) which is no easy task to understand and very commonly misunderstood. (For instance, a common misconception is that UEFI necessarily implies Secureboot. This is quite far from the truth and UEFI by itself is quite a useful replacement for BIOS). Many of these misconceptions are simply due to lack of knowledge about the intricacies and complexities behind these technologies. Some of it is simply FUD</text:span><text:span text:style-name="T25"><text:note text:id="ftn0" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body>
|
||||||
<text:h text:style-name="P19" text:outline-level="3">For Users</text:h>
|
<text:p text:style-name="P36">Fear, Uncertainty, Doubt<text:span text:style-name="T3">- propaganda, in other words.</text:span></text:p></text:note-body></text:note></text:span><text:span text:style-name="T25"> generated to prey on the fears of those who don’t understand the underlying specifications or technology.</text:span></text:p>
|
||||||
<text:p text:style-name="P13"><text:tab/><text:span text:style-name="T10">If you encounter any bugs (or have any suggestions on how to improve BDisk!), please file a bug report in my </text:span><text:a xlink:type="simple" xlink:href="https://bugs.square-r00t.net/index.php?project=2" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link"><text:span text:style-name="T10">bug tracker</text:span></text:a><text:span text:style-name="T10">.</text:span></text:p>
|
<text:p text:style-name="P6"><text:soft-page-break/><text:span text:style-name="T19"><text:tab/></text:span><text:span text:style-name="T20">It’s my hope that by releasing this utility and documenting it that you can use it and save some time for yourself as well </text:span><text:span text:style-name="T21">(and hopefully get the chance to learn a bit more in the process!)</text:span><text:span text:style-name="T20">. </text:span></text:p>
|
||||||
<text:h text:style-name="P19" text:outline-level="3"><text:bookmark-start text:name="__RefHeading___Toc175_449581326"/>For Developers<text:bookmark-end text:name="__RefHeading___Toc175_449581326"/></text:h>
|
<text:h text:style-name="P17" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc256_1260022884"/>What is this document?<text:bookmark-end text:name="__RefHeading___Toc256_1260022884"/></text:h>
|
||||||
<text:p text:style-name="P8"><text:span text:style-name="T3"><text:tab/>The source is available to browse </text:span><text:a xlink:type="simple" xlink:href="https://git.square-r00t.net/BDisk/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">online</text:a><text:span text:style-name="T3"> or can be checked out via </text:span><text:a xlink:type="simple" xlink:href="https://git-scm.com/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">git</text:a><text:span text:style-name="T3"> (via the </text:span><text:a xlink:type="simple" xlink:href="git://git.square-r00t.net/bdisk.git" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">git protocol</text:a><text:span text:style-name="T3"> or </text:span><text:a xlink:type="simple" xlink:href="https://git.square-r00t.net/BDisk" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http protocol</text:a><text:span text:style-name="T3">). It is also available via Arch Linux’s </text:span><text:a xlink:type="simple" xlink:href="https://aur.archlinux.org/packages/bdisk/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">AUR</text:a><text:span text:style-name="T3">. If you are interested in packaging </text:span><text:span text:style-name="T4">BDisk for other distributions, please feel free to </text:span><text:a xlink:type="simple" xlink:href="mailto:bts@square-r00t.net?subject=[BDISK] Packaging" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">contact me</text:a><text:span text:style-name="T4">.</text:span></text:p>
|
<text:p text:style-name="P8"><text:tab/><text:span text:style-name="T34">This document is intended to be an indexed and easier-to-use reference than the other plaintext files (in </text:span><text:span text:style-name="T2">docs/</text:span><text:span text:style-name="T6">). </text:span></text:p>
|
||||||
<text:p text:style-name="P7"/>
|
<text:h text:style-name="Heading_20_3" text:outline-level="3"><text:bookmark-start text:name="__RefHeading___Toc173_449581326"/>Conventions used in this document<text:bookmark-end text:name="__RefHeading___Toc173_449581326"/></text:h>
|
||||||
|
<text:p text:style-name="P25"><text:tab/><text:span text:style-name="T35">There are certain formats used in this document to specify what type of text they are representing.</text:span></text:p>
|
||||||
|
<text:list xml:id="list4863602129491927673" text:style-name="L1">
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P26"><text:span text:style-name="T35">Commands will be </text:span><text:span text:style-name="T10">in italics</text:span><text:span text:style-name="T20">.</text:span></text:p>
|
||||||
|
<text:list>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P26"><text:span text:style-name="T21">e.g. </text:span><text:span text:style-name="T11">cat /tmp/file.txt</text:span></text:p>
|
||||||
|
</text:list-item>
|
||||||
|
</text:list>
|
||||||
|
</text:list-item>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P26"><text:span text:style-name="T20">Paths (files, directories) will be </text:span><text:span text:style-name="T22">in bold</text:span><text:span text:style-name="T25"> </text:span><text:span text:style-name="T27">(unless part of a command, output, etc.)</text:span><text:span text:style-name="T15">.</text:span></text:p>
|
||||||
|
<text:list>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P26"><text:span text:style-name="T26">e.g. </text:span><text:span text:style-name="T15"><text:s/></text:span><text:span text:style-name="T12">/</text:span><text:span text:style-name="T13">tmp/file.txt</text:span></text:p>
|
||||||
|
</text:list-item>
|
||||||
|
</text:list>
|
||||||
|
</text:list-item>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P27"><text:span text:style-name="T24">Variables will be </text:span><text:span text:style-name="T28">underlined</text:span></text:p>
|
||||||
|
<text:list>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P27"><text:span text:style-name="T30">e.g. print(</text:span><text:span text:style-name="T28">foo</text:span><text:span text:style-name="T30">)</text:span></text:p>
|
||||||
|
</text:list-item>
|
||||||
|
</text:list>
|
||||||
|
</text:list-item>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P27"><text:span text:style-name="T30">URLs (hyperlinks, really; you should be able to click on them) are </text:span><text:span text:style-name="T29">bold and underlined</text:span><text:span text:style-name="T30">.</text:span></text:p>
|
||||||
|
<text:list>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P27"><text:span text:style-name="T30">e.g. </text:span><text:a xlink:type="simple" xlink:href="https://bdisk.square-r00t.net/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">https://bdisk.square-r00t.net</text:a></text:p>
|
||||||
|
</text:list-item>
|
||||||
|
</text:list>
|
||||||
|
</text:list-item>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P27"><text:span text:style-name="T30">Paramaters/arguments will be either </text:span><text:span text:style-name="T31">in</text:span><text:span text:style-name="T30"> <</text:span><text:span text:style-name="T31">angled brackets>, [square brackets], or [<both>]</text:span></text:p>
|
||||||
|
<text:list>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P28"><text:span text:style-name="T30"><> are used for positional arguments/parameters, or “placeholders”</text:span></text:p>
|
||||||
|
</text:list-item>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P28"><text:span text:style-name="T30">[] are used for optional arguments/parameters</text:span></text:p>
|
||||||
|
</text:list-item>
|
||||||
|
<text:list-item>
|
||||||
|
<text:p text:style-name="P28"><text:span text:style-name="T30">Thus e.g. </text:span><text:span text:style-name="T16">someprog –dostuff <stufftodo> [--domorestuff <morestufftodo>]</text:span></text:p>
|
||||||
|
</text:list-item>
|
||||||
|
</text:list>
|
||||||
|
</text:list-item>
|
||||||
|
</text:list>
|
||||||
|
<text:h text:style-name="P17" text:outline-level="2"><text:bookmark-start text:name="__RefHeading___Toc258_1260022884"/><text:soft-page-break/>Further information/resources<text:bookmark-end text:name="__RefHeading___Toc258_1260022884"/></text:h>
|
||||||
|
<text:h text:style-name="P20" text:outline-level="3"><text:bookmark-start text:name="__RefHeading___Toc220_1657685180"/>For Users<text:bookmark-end text:name="__RefHeading___Toc220_1657685180"/></text:h>
|
||||||
|
<text:p text:style-name="P10"><text:tab/><text:span text:style-name="T33">If you encounter any bugs (or have any suggestions on how to improve BDisk!), please file a bug report in my </text:span><text:a xlink:type="simple" xlink:href="https://bugs.square-r00t.net/index.php?project=2" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link"><text:span text:style-name="T33">bug tracker</text:span></text:a><text:span text:style-name="T33">.</text:span></text:p>
|
||||||
|
<text:h text:style-name="P20" text:outline-level="3"><text:bookmark-start text:name="__RefHeading___Toc175_449581326"/>For Developers<text:bookmark-end text:name="__RefHeading___Toc175_449581326"/></text:h>
|
||||||
|
<text:p text:style-name="P9"><text:span text:style-name="T4"><text:tab/>The source is available to browse </text:span><text:a xlink:type="simple" xlink:href="https://git.square-r00t.net/BDisk/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">online</text:a><text:span text:style-name="T4"> or can be checked out via </text:span><text:a xlink:type="simple" xlink:href="https://git-scm.com/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">git</text:a><text:span text:style-name="T4"> (via the </text:span><text:a xlink:type="simple" xlink:href="git://git.square-r00t.net/bdisk.git" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">git protocol</text:a><text:span text:style-name="T4"> or </text:span><text:a xlink:type="simple" xlink:href="https://git.square-r00t.net/BDisk" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http protocol</text:a><text:span text:style-name="T4">). It is also available via Arch Linux’s </text:span><text:a xlink:type="simple" xlink:href="https://aur.archlinux.org/packages/bdisk/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">AUR</text:a><text:span text:style-name="T4">. If you are interested in packaging </text:span><text:span text:style-name="T5">BDisk for other distributions, please feel free to </text:span><text:a xlink:type="simple" xlink:href="mailto:bts@square-r00t.net?subject=[BDISK]%20Packaging" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">contact me</text:a><text:span text:style-name="T5">.</text:span></text:p>
|
||||||
|
<text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc232_667539389"/><text:span text:style-name="T5">G</text:span><text:span text:style-name="T3">etting Started</text:span><text:bookmark-end text:name="__RefHeading___Toc232_667539389"/></text:h>
|
||||||
|
<text:p text:style-name="P8"/>
|
||||||
</office:text>
|
</office:text>
|
||||||
</office:body>
|
</office:body>
|
||||||
</office:document>
|
</office:document>
|
@ -14,6 +14,7 @@
|
|||||||
-- (http://blog.due.io/2014/linode-digitalocean-and-vultr-comparison/ etc.)
|
-- (http://blog.due.io/2014/linode-digitalocean-and-vultr-comparison/ etc.)
|
||||||
-implement pyalpm to decreate dependency on chroot pacman-ing?
|
-implement pyalpm to decreate dependency on chroot pacman-ing?
|
||||||
--or even maybe https://wiki.archlinux.org/index.php/offline_installation_of_packages in pure python!
|
--or even maybe https://wiki.archlinux.org/index.php/offline_installation_of_packages in pure python!
|
||||||
|
-set up automatic exporting to PDF of the user manual server-side. https://pypi.python.org/pypi/unoconv/0.6
|
||||||
|
|
||||||
|
|
||||||
## NETWORKING ##
|
## NETWORKING ##
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
<?php
|
|
||||||
$password = readline("Password: ");
|
|
||||||
$saltRaw = random_bytes(8);
|
|
||||||
$salt = base64_encode($saltRaw);
|
|
||||||
$result = crypt($password,'$6' . '$' . $salt .'$');
|
|
||||||
print $result . "\n";
|
|
||||||
?>
|
|
@ -4,7 +4,7 @@ Description=Restoring Installed Packages DB
|
|||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
#ExecStart=/usr/bin/tar -Jxf /usr/local/pacman.db.tar.xz -C /var/lib/pacman/
|
#ExecStart=/usr/bin/tar -Jxf /usr/local/pacman.db.tar.xz -C /var/lib/pacman/
|
||||||
ExecStart=/etc/systemd/system/scripts/pacmandb.sh
|
ExecStart=/usr/bin/bash /etc/systemd/system/scripts/pacmandb.sh
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
Loading…
Reference in New Issue
Block a user