i should probably license this shit now that it's public.

more fixes

fixing new patches

fixing new patches

.gitignore

@@ -23,3 +23,11 @@
 /screenlog*
 /logs
 *.swp
+*.lck
+#src/ipxe/src/
+
+# You should really generate local copies of these, as they're pretty private.
+extra/pre-build.d/etc/openvpn/client.conf
+overlay/etc/ssh/*
+overlay/home/bdisk
+overlay/etc/systemd/system/multi-user.target.wants/openvpn@client.service

.gitmodules

@@ -0,0 +1,5 @@
+[submodule "ipxe"]
+	branch = master
+[submodule "src/ipxe"]
+	path = src/ipxe
+	url = git://git.ipxe.org/ipxe.git

COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README

@@ -6,13 +6,6 @@
 #####    Built upon my (Brent's) 'BDisk' ISO-building framework (http://bdisk.square-r00t.net)                                   #####
 ######################################################################################################################################
 
-## Why Arch? ##
-Because it's a largely easy-to-use, well-documented (https://wiki.archlinux.org/) distro. It's no-frills and incredibly
-flexible/customizable, and can be made rather slim. It's also very friendly to run as a chroot inside any other distro.
-
-All commands below should be issued in the root working directory of this git repository. (For me, this is
-/opt/dev/work/BDisk but this may be entirely different for you, depending on where you cloned the repository to.)
-
 !!!!!! WARNING !!!!!!!
 I do NOT recommend running this on a machine that is using wireless, as it will download a LOT of data.
 If you ignore this warning, be prepared to explain to anyone you share your wifi with why Facebook takes 20 seconds to load,
@@ -26,6 +19,38 @@ disabled by default).
 Till then, sorry for the inconvenience.
 !!!!!!!!!!!!!!!!!!!!!!
 
+
+## Why Arch? ##
+Because it's a largely easy-to-use, well-documented (https://wiki.archlinux.org/) distro. It's no-frills and incredibly
+flexible/customizable, and can be made rather slim. It's also very friendly to run as a chroot inside any other distro.
+
+All commands below should be issued in the root working directory of this git repository. (For me, this is
+/opt/dev/work/BDisk but this may be entirely different for you, depending on where you cloned the repository to.)
+
+## Features ##
+-Builds a hybrid ISO
+	A hybrid ISO allows one to simply dd if=/path/to/file.iso of=/dev/<USB STICK> instead of using e.g. UNetBootin while also
+	working with traditional optical media.
+-Builds a dual-architecture ISO
+	BDisk allows you to create both a 32-bit and 64-bit ISO, either separately or part of the same ISO, and customize each
+	based on architecture.
+-Supports both BIOS and UEFI booting in one ISO
+	It can be difficult finding a live distribution that offers full UEFI support, which is frustrating if you're trying to
+	install e.g. UEFI-enabled Gentoo, for instance. Not only does this ISO framework build support for both in the same ISO,
+	but it also includes some UEFI shells as well.
+-Arch install scripts
+	This live distro, assuming default packages are kept, should be 100% compatible with the Arch install guide
+	(https://wiki.archlinux.org/index.php/installation_guide).
+-Allows for non-interactive runs, is git-friendly, logs all output while keeping the runtime output relatively sane, and allows
+	the inclusion of arbitrary files in the finished filesystem.
+-TFP/HTTP/PXE support
+	It will automatically copy over some files to tftpboot/ and http/, greatly saving some time in PXE booting. It also
+	supports, by default, booting PXE with HTTP fetching for the squashed filesystems. Say goodbye to NFS. You can even
+	automatically rsync over after the build, if you wish, to your webserver (see sub-point)
+	-Additionally, it supports iPXE if enabled in the configuration file. Please see examples/HTTP for an example of how to
+	lay this out and what sort of directory hierarchy is needed.
+-Automatic versioning based on git tags
+
 ## Prerequisites ##
 -At least ~20Gb disk space free (remember, you need room for not only four chroots (one developing and one staging for i686/x86_64),
 but also disk space for working, the finished ISO(s), etc.)
@@ -47,98 +72,99 @@ squashfs-tools
 xorriso (in RPMForge repo for CentOS 7)
 xz
 
-and *probably* a few others. the scripts run with set -e for the most part, so if something's missed, you'll know.
-oh, you will know.
+and *probably* a few others. The scripts run with set -e for the most part, so if something's missed, you'll know.
+Oh, you will know.
 
 
+## Configuration ##
+See extra/build.conf.sample. Copy to <PROJECT ROOT>/build.conf if you wish to modify any of the values, otherwise the defaults
+will be used. I recommend enabling I_AM_A_RACECAR if you have the hardware for it, as it can speed things up greatly.
+The file should be well-commented.
+
+Also note the following files/paths:
+
+-bin:
+	The building/cleaning scripts.
+--/build.sh:
+	Supports several modes:
+	bin/build.sh update		Updates existing chroots (does an apacman -Syyu --devel, copies over fresh files from
+					overlays, etc.)
+	bin/build.sh chroot		Chroots you into the runtime for any interactive tasks you may wish to run.
+	bin/build.sh build		(DEFAULT) Builds the chroots, ISO, etc.
+	bin/build.sh all		Same as bin/build.sh build
+	bin/build.sh			Same as bin/build.sh build
+--/clean.sh:
+	Supports several modes:
+	bin/clean.sh all		Clears everything out to a near-pristine working state. For convenience, it DOES NOT clear
+					out build.conf.
+	bin/clean.sh chroot		Clears out only the working spaces, old ISOs, and the chroot directories. Hnady if you want to "start
+					fresh" but still want to keep logs from earlier runs.
+	bin/clean.sh squash		Clears out only the working spaces and old ISOs. Useful if you're on a slow connection and would
+					rather update the chroots instead of downloading filesystem snapshots again.
+	bin/clean.sh			Only clears workspaces and old ISOs.
+--/mirror.lst.sh:
+	Builds a fresh mirror list. Note that it is US based.
+
+-examples:
+	Included recommendation for how to lay things out, etc.
+--/HTTP:
+	Recommended layout for webserver layout if using iPXE.
+-extra:
+	Supporting files for the base building system (mirrorlist, etc.).
+--/${UXNAME}.png:
+	A 640x480 8-bit RGBA colour PNG which will be used as the background for the bootsplash (if booting via BIOS and not UEFI)
+--/bootstrap/apacman-*.tar.xz:
+	An AUR-enabled package manager. Necessary for AUR support.
+--/build.conf.sample:
+	Sample/default config file. If you wish to override any settings, copy to <PROJECT ROOT>/build.conf and make your changes there.
+	First run of the script will do this for you automatically.
+--/mirrorlist:
+	A set of default mirrorlists to be used for the chroots during building and runtime. Feel free to replace with your own
+	mirrorlist (current list is speed-optimized for east coast US).
+--/packages.32:
+	A list of packages to install in the base system (32-bit runtime only).
+--/packages.64:
+	A list of packages to install in the base system (64-bit runtime only).
+--/packages.both:
+	A list of packages to install in the base system (these should be installed and are supported on both 64- AND 32-bit)
+--/pre-build.d:
+	Contains files injected into the system. Both 64-bit and 32-bit environments. Note: be sure to place them in hierarchical order
+	(e.g. if you wish to have a file at /usr/foo/bar, you will need to place it in <PROJECT ROOT>/extra/pre-build.d/usr/foo/bar)
+--/pre-build.d/32:
+	Same as above, but only for 32-bit environments.
+--/pre-build.d/64:
+	You get the picture.
+-http:
+	Files to be hosted for PXE booting the environment go here. Set this as your root/DocumentRoot in nginx/Apache (or, ideally,
+	copy over to a separate webserver). This directory is wiped out during any bin/clean.sh operation.
+-lib:
+	The "guts" of BDisk.
+-logs:
+	Here you can find full output of the runs. They are prefixed with run's PID number, and named after the function they occur in.
+-overlay:
+	These files are applied AFTER the initial setup of the chroots. Same hierarchy rules as extra/pre-build.d.
+-README:
+	This file.
+-src:
+	Supporting source code/source code from other projects.
+--ipxe/:
+	For iPXE support.
+--ipxe_local/:
+	Various patches and supporting configs to tweak the iPXE build.
+-tftpboot:
+	Files to be served via TFTP for PXE booting. This directory is wiped out during any bin/clean.sh operation.
+-TODO:
+	This is just what I'm using to track stuff I want to add.
+
+
+You may notice other files come and go; they're mostly there for extra goodies/used to determine other things.
+
 ## (Re)Building ##
-$ sudo bin/build.sh
+Building must be done as root, and on an Arch x86_64 system (future versions will allow for non-Arch distros).
+
+# bin/build.sh
 
 Yeah. It's that easy. The finished product is in iso/.
 
-Build output should look something like this:
-
-
-[root@dawid BDisk]# time nice -n "-19" bin/build.sh 
-You have not configured a build.conf OR you are not running from the project's root directory (the git repository's working directory).
- If you are indeed in the correct directory, you may copy the sample at extra/build.conf.sample,
- edit it for appropriate values, and copy to <PROJECT ROOT>/build.conf
-For now, though, I am copying over the default.
-Checking directory structure and creating lockfile at /opt/dev/work/BDisk/lockfile.lck...
-/opt/dev/work/BDisk/root.i686 does not exist - creating.
-/opt/dev/work/BDisk/root.x86_64 does not exist - creating.
-/opt/dev/work/BDisk/build32 does not exist - creating.
-/opt/dev/work/BDisk/build64 does not exist - creating.
-/opt/dev/work/BDisk/iso does not exist - creating.
-/opt/dev/work/BDisk/temp/bdisk does not exist - creating.
-/opt/dev/work/BDisk/temp/FPOS does not exist - creating.
-/opt/dev/work/BDisk/src does not exist - creating.
-/opt/dev/work/BDisk/tftpboot does not exist - creating.
-/opt/dev/work/BDisk/http/FPOS does not exist - creating.
-/opt/dev/work/BDisk/logs does not exist - creating.
-No existing chroot environment found. Creating...
-Now importing settings/variables.
-Checking/fetching snapshots...
-Extracting snapshots. This will take a while...
-Configuring snapshots...
-Initializing chroots...
-Prepping /opt/dev/work/BDisk/root.i686. This will take a while...
-...Key initializing...Done.
-...Importing keys...Done.
-...Installing base packages...Done.
-...Upgrading any outdated packages...Done. Finishing/cleaning up...
-Prepping /opt/dev/work/BDisk/root.x86_64. This will take a while...
-...Key initializing...Done.
-...Importing keys...Done.
-...Installing base packages...Done.
-...Upgrading any outdated packages...Done. Finishing/cleaning up...
-Installing common packages...
-...Packages installing to /opt/dev/work/BDisk/root.i686...Compiling kernel sources...Regular packages......Creating bdisk user...Done.
-Done.
-...Packages installing to /opt/dev/work/BDisk/root.x86_64...Compiling kernel sources...Regular packages......Creating bdisk user...Done.
-Done.
-Installing packages for 32-bit...
-Done.
-Installing packages for 64-bit...
-Done.
-Syncing overlay...
-Done.
-Chroot setup complete.
-Checking for appropriate kernel version and mksquashfs version...
-Data is not sync'd to buildroot; syncing...
-Syncing important files to /opt/dev/work/BDisk/build64 for building the squashed filesystem (this may take some time)...
-Compressing the package DB...
-cp: ‘/opt/dev/work/BDisk/build64/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/build64/etc/localtime’ are the same file
-cp: ‘/opt/dev/work/BDisk/root.x86_64/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/root.x86_64/etc/localtime’ are the same file
-Cleaning up unnecessary cruft in /opt/dev/work/BDisk/build64...
-[64-bit] Now generating the squashed image (if we need to) and hashes. This may take some time.
-[64-bit] Squashing filesystem. This can take a while depending on the size of your chroot(s).
-[64-bit] Copying files for PXE, and ISO building, please be patient.
-Data is not sync'd to buildroot; syncing...
-Syncing important files to /opt/dev/work/BDisk/build32 for building the squashed filesystem (this may take some time)...
-Compressing the package DB...
-cp: ‘/opt/dev/work/BDisk/build32/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/build32/etc/localtime’ are the same file
-cp: ‘/opt/dev/work/BDisk/root.i686/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/root.i686/etc/localtime’ are the same file
-Cleaning up unnecessary cruft in /opt/dev/work/BDisk/build32...
-[32-bit] Now generating the squashed image (if we need to) and hashes. This may take some time.
-[32-bit] Squashing filesystem. This can take a while depending on the size of your chroot(s).
-[32-bit] Copying files for PXE, and ISO building, please be patient.
-Building the actual .iso image. This may take a while.
-Setting up EFI stuff...
-Checking/fetching UEFI shells...
-Generating the EFI embedded FAT filesystem...
-EFI configuration complete...
-ISO generated; size is 1.3G.
-You can find it at /opt/dev/work/BDisk/iso/bdisk-v1.04-a8666bd-any.iso
-Cleaning up some stuff leftover from the build...
-Finished successfully!
-
-real    250m48.104s
-user    163m6.046s
-sys     8m26.573s
-
-
-
-
 
 If you want more verbosity, check out the logs/ directory.

TODO

@@ -1,7 +1,11 @@
 ## General ##
 
--include WinMTR, build Mac OS X MTR for dist/tools on CD
--include pre-compiled DoxBox for opening LUKS parts on Windows (https://github.com/t-d-k/doxbox)
+-include benchmarking
+-- http://sourceforge.net/projects/unixbench/
+-- https://code.google.com/p/byte-unixbench/
+-- https://github.com/akopytov/sysbench
+-- (http://blog.due.io/2014/linode-digitalocean-and-vultr-comparison/ etc.)
+-package in AUR
 
 
 ## NETWORKING ##
@@ -9,8 +13,8 @@
 -shorewall/some other firewall?
 -WISH: locked-down VPN?
 -autodetection/configuration of network. DHCP is currently running by default, but does it need to support IPv6? if so, how would the user configure their network?
--WISH: support iPXE? would save on ISO file size (letting us create MUCH bigger squash systems), but the downside is we lose EFI support and it requires a working network configuration- which defeats the purpose of a diagnostic disc.
 -SECURE SSH: https://stribika.github.io/2015/01/04/secure-secure-shell.html
+-DISABLE NETWORKMANAGER AND "fi.w1.wpa_supplicant1"??? keeps spawning wpa_supplicant (and thusly killing networking proper)
 
 
 ## Building ##
@@ -22,8 +26,24 @@
 -tweak build.conf (and build.conf.sample) to source the pwd and set as BASEDIR ***if*** the project resources are present in pwd, otherwise throw warning
 --this is half-done;PWD is currently used by default.
 -does gummiboot? loader? wtfever it's called support splash backgrounds? can i implement that differently somehow?
--Host-specific chroot customizations (i.e. -J in <chroot>/etc/makepkg.conf
 -strip out/remove unnecessary and orphan packages (e.g. gcc, make, automake, etc.)
+-incorporate iPXE tweaks:
+--http://ipxe.org/crypto
+--http://ipxe.org/cmd/imgtrust
+--http://ipxe.org/cmd/imgverify
+--https://aur.archlinux.org/packages/ip/ipxe-git/PKGBUILD (NOTE the patches- banner and efi iso specifically)
+--add conf option to specify EMBED uri
+-X-platform
+--what distros are supported?
+--automatically install what we need for buildtime
+--hardcode list of runtime dependencies (e.g. openssh, vim, etc.)
+
+## Split into Separate Tools CD ##
+
+-include WinMTR, build Mac OS X MTR for dist/tools on CD
+-include pre-compiled LibreCrypt for opening LUKS parts on Windows (https://github.com/t-d-k/LibreCrypt)
+--curl -s https://raw.githubusercontent.com/t-d-k/LibreCrypt/master/README.md | egrep 'InstallLibreCrypt_v[A-Za-z0-9\.]*.exe' | cut -f2 -d'"'
+
 
 __________________________________________________________
 FOOTNOTES:

bin/build.sh

@@ -63,7 +63,7 @@ echo "Checking directory structure and creating lockfile at ${LOCKFILE}..."
 touch ${LOCKFILE}
 
 # make sure the paths exist and then check for an existing chroot session
-for i in ${ROOTDIR} ${CHROOTDIR32} ${CHROOTDIR64} ${BUILDDIR}32 ${BUILDDIR}64 ${ISODIR} ${MOUNTPT} ${TEMPDIR}/{${UXNAME},${DISTNAME}} ${ARCHBOOT} ${SRCDIR} ${TFTPDIR} ${HTTPDIR}/${DISTNAME} ${BASEDIR}/logs;
+for i in ${BASEDIR} ${CHROOTDIR32} ${CHROOTDIR64} ${BUILDDIR}32 ${BUILDDIR}64 ${ISODIR} ${MOUNTPT} ${TEMPDIR}/{${UXNAME},${DISTNAME}} ${ARCHBOOT} ${SRCDIR} ${TFTPDIR} ${HTTPDIR}/${DISTNAME} ${BASEDIR}/logs;
 do
  if [ ! -d ${i} ];
  then
@@ -109,17 +109,17 @@ EOF
 
 ## FUNCTIONS ##
 
-source lib/00-im_batman.func.sh
-source lib/01-holla_atcha_boi.func.sh
-source lib/02-release_me.func.sh
-source lib/03-facehugger.func.sh
-source lib/04-chroot_wrapper.func.sh
-source lib/05-jenny_craig.func.sh
-source lib/06-centos_is_stupid.func.sh
-source lib/07-will_it_blend.func.sh
-source lib/08-stuffy.func.sh
-source lib/09-yo_dj.func.sh
-source lib/10-mentos.func.sh
+source lib/02-im_batman.func.sh
+source lib/03-holla_atcha_boi.func.sh
+source lib/04-release_me.func.sh
+source lib/05-facehugger.func.sh
+source lib/06-chroot_wrapper.func.sh
+source lib/07-jenny_craig.func.sh
+source lib/08-centos_is_stupid.func.sh
+source lib/09-will_it_blend.func.sh
+source lib/10-stuffy.func.sh
+source lib/11-yo_dj.func.sh
+source lib/12-mentos.func.sh
 
 ## The Business-End(TM) ##
 
@@ -183,7 +183,7 @@ fi
 echo "Cleaning up some stuff leftover from the build..."
 #rm -rf ${TEMPDIR}/*
 #rm -rf ${SRCDIR}/*
-cd ${ROOTDIR}
+cd ${BASEDIR}
 
 if [[ "${GIT}" == "yes" ]];
 then

examples/HTTP/boot.php

@@ -0,0 +1,9 @@
+<?php
+print '#!ipxe
+
+cpuid --ext 29 && set bit_type 64 || set bit_type 32
+initrd example.${bit_type}.img
+kernel example.${bit_type}.kern initrd=example.${bit_type}.img ip=:::::eth0:dhcp archiso_http_srv=http://domain.tld/path/to/squashes/ archisobasedir=EXAMPLE archisolabel=EXAMPLE checksum=y
+boot
+'
+?>

examples/HTTP/example.32.img

@@ -0,0 +1 @@
+NOT A REAL INITRD IMAGE. REPLACE WITH ACTUAL INITRD.

examples/HTTP/example.32.kern

@@ -0,0 +1 @@
+NOT A REAL KERNEL FILE. REPLACE WITH ACTUAL KERNEL

examples/HTTP/example.64.img

@@ -0,0 +1 @@
+NOT A REAL INITRD IMAGE. REPLACE WITH ACTUAL INITRD.

examples/HTTP/example.64.kern

@@ -0,0 +1 @@
+NOT A REAL KERNEL FILE. REPLACE WITH ACTUAL KERNEL

examples/HTTP/path/to/squashes/EXAMPLE/i686/airootfs.md5

@@ -0,0 +1 @@
+c18bde6e20c195bfb0a018b5c13dc420  airootfs.sfs

examples/HTTP/path/to/squashes/EXAMPLE/i686/airootfs.sfs

@@ -0,0 +1 @@
+NOT A REAL SQUASHED FILESYSTEM FILE. REPLACE WITH ACTUAL SQUASHED FILESYSTEM

examples/HTTP/path/to/squashes/EXAMPLE/i686/airootfs.sha256

@@ -0,0 +1 @@
+ada655a13f53702b3fe13cae001ab14f741e10c2bb83869048d4c18e74111c12  airootfs.sfs

examples/HTTP/path/to/squashes/EXAMPLE/x86_64/airootfs.md5

@@ -0,0 +1 @@
+c18bde6e20c195bfb0a018b5c13dc420  airootfs.sfs

examples/HTTP/path/to/squashes/EXAMPLE/x86_64/airootfs.sfs

@@ -0,0 +1 @@
+NOT A REAL SQUASHED FILESYSTEM FILE. REPLACE WITH ACTUAL SQUASHED FILESYSTEM

examples/HTTP/path/to/squashes/EXAMPLE/x86_64/airootfs.sha256

@@ -0,0 +1 @@
+ada655a13f53702b3fe13cae001ab14f741e10c2bb83869048d4c18e74111c12  airootfs.sfs

extra/build.conf.sample

@@ -30,7 +30,7 @@ BASEDIR="$(pwd)"
 ISODIR="${BASEDIR}/iso"
 
 # Where source code is kept.
-SRCDIR="${BASEDIR}/src"
+SRCDIR="${BASEDIR}/extrasrc"
 
 # Where we mount for chroots etc.
 MOUNTPT="/mnt/${UXNAME}"
@@ -57,6 +57,10 @@ TFTPGRP="root"
 # (and thus doesn't fit on a normal CD. Still fits on DVDs and USBs though!)
 MULTIARCH="yes"
 
+# If you would like to build an iPXE-enabled *mini* ISO *in addition to* the ful ISO,
+# set this to "yes". Otherwise, just build the full ISO.
+BUILDMINI="no"
+
 # set to "yes" to enable pushing new changes to a git repo/committing to a local repo
 GIT="no"
 
@@ -119,27 +123,27 @@ I_AM_A_RACECAR="no"
 # about what you are doing!!!
 
 # Legacy support.
-ROOTDIR="${BASEDIR}"
+BASEDIR="${BASEDIR}"
 
-# This used to be defined statically (e.g. CHROOTDIR="${ROOTDIR}/chroot"),
+# This used to be defined statically (e.g. CHBASEDIR="${BASEDIR}/chroot"),
 # but is now dynamically appended. Please don't alter this unless you renamed the chroot directory paths.
 CHROOTDIR="${BASEDIR}/"
-CHROOTDIR32="${CHROOTDIR}root.i686"
-CHROOTDIR64="${CHROOTDIR}root.x86_64"
+CHROOTDIR32="${CHBASEDIR}root.i686"
+CHROOTDIR64="${CHBASEDIR}root.x86_64"
 
 # This is a directory we use for staging. It definitely should not be checked into git.
-# It used to be defined statically (e.g. BUILDDIR="${ROOTDIR}/build"),
+# It used to be defined statically (e.g. BUILDDIR="${BASEDIR}/build"),
 # but is now dynamically appended. Please don't alter this unless you renamed the chroot directory paths.
 BUILDDIR="${BASEDIR}/build"
 
 # More staging.
-TEMPDIR="${ROOTDIR}/temp"
+TEMPDIR="${BASEDIR}/temp"
 
 # This is where we stage the boot files.
 ARCHBOOT="${TEMPDIR}/${DISTNAME}"
 
 # Lockfile for checking for concurrent/failed builds
-LOCKFILE="${ROOTDIR}/lockfile.lck"
+LOCKFILE="${BASEDIR}/lockfile.lck"
 
 
 ## VARIABLE PROCESSING ##
@@ -151,7 +155,6 @@ if [ -z "${MULTIARCH}" ];
 then
  MULTIARCH="y"
 fi
-
 MULTIARCH=${MULTIARCH:0:1}
 MULTIARCH=$(echo ${MULTIARCH} | tr [[:upper:]] [[:lower:]])
 
@@ -160,6 +163,13 @@ if [ -z "${I_AM_A_RACECAR}" ];
 then
  I_AM_A_RACECAR="n"
 fi
-
 I_AM_A_RACECAR=${I_AM_A_RACECAR:0:1}
 I_AM_A_RACECAR=$(echo ${I_AM_A_RACECAR} | tr [[:upper:]] [[:lower:]])
+
+# BUILD MINI?
+if [ -z "${BUILDMINI}" ];
+then
+ BUILDMINI="n"
+fi
+BUILDMINI=${BUILDMINI:0:1}
+BUILDMINI=$(echo ${BUILDMINI} | tr [[:upper:]] [[:lower:]])

extra/external/SMC_DumpKey/README

@@ -0,0 +1,3 @@
+taken with graces to http://www.contrib.andrew.cmu.edu/~somlo/OSXKVM/
+
+Needs to be compiled on linux with gcc, and only runs on genuine Apple hardware (as it polls the SMC chip for the given value)

extra/external/SMC_DumpKey/SmcDumpKey.c

@@ -0,0 +1,193 @@
+/*
+ * prints out 4-character name of the SMC key at given index position;
+ *
+ * by Gabriel L. Somlo <somlo@cmu.edu>, Summer 2014
+ *
+ * Compile with: gcc -O2 -o SmcDumpKey SmcDumpKey.c -Wall
+ *
+ * You probably want to "modprobe -r applesmc" before running this...
+ *
+ * Code bits and pieces shamelessly ripped from the linux kernel driver
+ * (drivers/hwmon/applesmc.c by N. Boichat and H. Rydberg)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <limits.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/io.h>
+#include <linux/byteorder/little_endian.h>
+
+
+#define APPLESMC_START 0x300
+#define APPLESMC_RANGE 0x20
+
+#define APPLESMC_DATA_PORT	(APPLESMC_START + 0x00)
+#define APPLESMC_CMD_PORT	(APPLESMC_START + 0x04)
+
+#define APPLESMC_READ_CMD		0x10
+#define APPLESMC_GET_KEY_BY_INDEX_CMD	0x12
+#define APPLESMC_GET_KEY_TYPE_CMD	0x13
+
+
+/* wait up to 128 ms for a status change. */
+#define APPLESMC_MIN_WAIT	0x0010
+#define APPLESMC_RETRY_WAIT	0x0100
+#define APPLESMC_MAX_WAIT	0x20000
+
+
+#define APPLESMC_KEY_NAME_LEN	4
+#define APPLESMC_KEY_TYPE_LEN	4
+
+typedef struct key_type {
+  uint8_t data_len;
+  uint8_t data_type[APPLESMC_KEY_TYPE_LEN];
+  uint8_t flags;
+} __attribute__((packed)) key_type;
+ 
+
+/* wait_read - Wait for a byte to appear on SMC port. */
+static int
+wait_read(void)
+{
+  uint8_t status;
+  int us;
+
+  for (us = APPLESMC_MIN_WAIT; us < APPLESMC_MAX_WAIT; us <<= 1) {
+    usleep(us);
+    status = inb(APPLESMC_CMD_PORT);
+    /* read: wait for smc to settle */
+    if (status & 0x01)
+      return 0;
+  }
+
+  fprintf(stderr, "wait_read() fail: 0x%02x\n", status);
+  return -1;
+}
+
+/*send_byte - Write to SMC port, retrying when necessary. */
+static int
+send_byte(uint8_t cmd, unsigned short port)
+{
+  uint8_t status;
+  int us;
+
+  outb(cmd, port);
+  for (us = APPLESMC_MIN_WAIT; us < APPLESMC_MAX_WAIT; us <<= 1) {
+    usleep(us);
+    status = inb(APPLESMC_CMD_PORT);
+    /* write: wait for smc to settle */
+    if (status & 0x02)
+      continue;
+    /* ready: cmd accepted, return */
+    if (status & 0x04)
+      return 0;
+    /* timeout: give up */
+    if (us << 1 == APPLESMC_MAX_WAIT)
+      break;
+    /* busy: long wait and resend */
+    usleep(APPLESMC_RETRY_WAIT);
+    outb(cmd, port);
+  }
+
+  fprintf(stderr,
+          "send_byte(0x%02x, 0x%04x) fail: 0x%02x\n", cmd, port, status);
+  return -1;
+}
+
+static int
+send_argument(const uint8_t *key)
+{
+  int i;
+
+  for (i = 0; i < APPLESMC_KEY_NAME_LEN; i++)
+    if (send_byte(key[i], APPLESMC_DATA_PORT))
+      return -1;
+  return 0;
+}
+
+static int
+read_smc(uint8_t cmd, const uint8_t *key, uint8_t *buf, uint8_t len)
+{
+  int i;
+
+  if (send_byte(cmd, APPLESMC_CMD_PORT) || send_argument(key)) {
+    fprintf(stderr, "%.4s: read arg fail\n", key);
+    return -1;
+  }
+
+  if (send_byte(len, APPLESMC_DATA_PORT)) {
+    fprintf(stderr, "%.4s: read len fail\n", key);
+    return -1;
+  }
+
+  for (i = 0; i < len; i++) {
+    if (wait_read()) {
+      fprintf(stderr, "%.4s: read data[%d] fail\n", key, i);
+      return -1;
+    }
+    buf[i] = inb(APPLESMC_DATA_PORT);
+  }
+
+  return 0;
+}
+
+
+int
+main(int argc, char **argv)
+{
+  key_type kt;
+  uint8_t data_buf[UCHAR_MAX];
+  uint8_t i;
+
+  if (argc != 2 || strlen(argv[1]) != APPLESMC_KEY_NAME_LEN) {
+    fprintf(stderr, "\nUsage: %s <4-char-key-name>\n\n", argv[0]);
+    return -1;
+  }
+
+  if (ioperm(APPLESMC_START, APPLESMC_RANGE, 1) != 0) {
+    perror("ioperm failed");
+    return -2;
+  }
+
+  if (read_smc(APPLESMC_GET_KEY_TYPE_CMD,
+               (uint8_t *)argv[1], (uint8_t *)&kt, sizeof(kt)) != 0) {
+    fprintf(stderr, "\nread_smc get_key_type error\n\n");
+    return -3;
+  }
+  printf("  type=\"");
+  for (i = 0; i < APPLESMC_KEY_TYPE_LEN; i++)
+    printf(isprint(kt.data_type[i]) ? "%c" : "\\x%02x",
+           (uint8_t)kt.data_type[i]);
+  printf("\" length=%d flags=%x\n", kt.data_len, kt.flags);
+
+  if (read_smc(APPLESMC_READ_CMD, 
+               (uint8_t *)argv[1], data_buf, kt.data_len) != 0) {
+    fprintf(stderr, "\nread_smc get_key_data error\n\n");
+    return -4;
+  }
+  printf("  data=\"");
+  for (i = 0; i < kt.data_len; i++)
+    printf(isprint(data_buf[i]) ? "%c" : "\\x%02x",
+           (uint8_t)data_buf[i]);
+  printf("\"\n");
+
+  return 0;
+}

extra/mirrorlist

@@ -1,7 +1,7 @@
-# Server list generated by rankmirrors on 2015-01-10
+# Server list generated by rankmirrors on 2015-02-26
 Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
-Server = http://mirror.yellowfiber.net/archlinux/$repo/os/$arch
-Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch
-Server = http://mirror.us.leaseweb.net/archlinux/$repo/os/$arch
-Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch
 Server = http://mirror.umd.edu/archlinux/$repo/os/$arch
+Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch
+Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch
+Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch
+Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch

extra/packages.both

@@ -2,7 +2,7 @@
 # We need to install all X drivers.
 abs
 acpi
-acpidump
+#acpidump
 afflib
 aircrack-ng
 apr
@@ -16,6 +16,7 @@ autopsy
 autossh
 beep
 bin86
+bind-tools
 binutils
 bluez-utils
 bonnie++
@@ -60,7 +61,7 @@ djohn
 dmidecode
 dnssec-anchors
 dnstracer
-dnsutils
+#dnsutils #replaced by bind-tools, https://www.archlinux.org/packages/extra/x86_64/bind-tools/
 dos2unix
 dosfstools
 dropbear
@@ -115,6 +116,7 @@ hddtemp
 hdparm
 hexcurse
 hexedit
+hfsprogs
 hfsutils
 htop
 httping
@@ -129,6 +131,7 @@ iotop
 iozone
 ipcalc
 iperf
+iperf3
 iproute2
 ipsec-tools
 iptraf-ng
@@ -191,6 +194,7 @@ netctl
 netselect
 nettle
 networkmanager
+networkmanager-pptp
 nginx-devel
 ngrep
 nmap
@@ -232,14 +236,14 @@ psmisc
 pv
 pwgen
 pxz
-pyrit
+pyrit-svn
 python2-gnuplot
 python2-pyx
 rarcrack
 rcracki_mt
 rdiff-backup
 read-edid
-reaver
+reaver-wps-fork-t6x-git
 rename
 rfkill
 rp-pppoe
@@ -316,7 +320,7 @@ vpnc
 weplab
 whdd
 whois
-wifite
+wifite-mod-pixiewps-git
 wipe
 wireshark-cli
 wpscrack

extra/pre-build.d/32/etc/pacman.conf

@@ -89,6 +89,6 @@ Include = /etc/pacman.d/mirrorlist
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-[archlinuxfr]
-SigLevel = Never
-Server = http://repo.archlinux.fr/$arch
+#[archlinuxfr]
+#SigLevel = Never
+#Server = http://repo.archlinux.fr/$arch

extra/pre-build.d/64/etc/pacman.conf

@@ -98,6 +98,6 @@ Include = /etc/pacman.d/mirrorlist
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-[archlinuxfr]
-SigLevel = Never
-Server = http://repo.archlinux.fr/$arch
+#[archlinuxfr]
+#SigLevel = Never
+#Server = http://repo.archlinux.fr/$arch

extra/pre-build.d/etc/apacman.conf

@@ -0,0 +1,57 @@
+#
+# /etc/apacman.conf
+#
+# See the apacman.conf(5) manpage for options
+
+#
+# GENERAL OPTIONS
+#
+
+#auronly=1
+#buildonly=1
+#cachevcs=1
+#ignorearch=1
+#needed=1
+noconfirm=1
+noedit=1
+#noaur=1
+#noconfirm=1
+#noedit=1
+#nofail=1
+#preview=1
+#purgebuild=1
+#quiet=1
+#skipcache=1
+skipinteg=1
+#skiptest=1
+#warn=1
+tmpdir=/var/tmp/apacman
+TMPDIR=/var/tmp/apacman
+
+#
+# CONFIGURATION
+#
+
+#tmpdir="/tmp/apacmantmp-$UID"
+#makepkgconf="/etc/makepkg.conf"
+#usermakepkgconf="$HOME/.makepkg.conf"
+#pacmanconf="/etc/pacman.conf"
+#downdir="/var/cache/pacman/pkg"
+#savedir="/var/cache/apacman/pkg"
+#editor="nano -w"
+editor="vim"
+#RPCURL="https://aur.archlinux.org/rpc.php?type"
+#PKGURL="https://aur.archlinux.org"
+#ABSURL="rsync.archlinux.org"
+
+#
+# COLORIZATION
+#
+
+COLOR1='\e[1;39m'
+COLOR2='\e[1;32m'
+COLOR3='\e[1;35m'
+COLOR4='\e[1;36m'
+COLOR5='\e[1;34m'
+COLOR6='\e[1;33m'
+COLOR7='\e[1;31m'

extra/pre-build.d/etc/customizepkg.d/linux

@@ -1,89 +0,0 @@
-#!/bin/sh
-# change some versions around
-sed -i -e 's/^\(pkgbase=linux[[:space:]]*\)/#\1/g' ${1}
-sed -i -e 's/^#\(pkgbase=linux-\)custom.*$/\1BDisk/g' ${1}
-sed -i -e '/^_kernelname/a KERNVER=$(echo ${pkgver} | sed -e "s/\\\([0-9]\\\.[0-9]*\\\).*$/\\\1/")' ${1}
-sed -i -e "s/^\(makedepends=.*\))$/\1 'rsync' 'git')/g" ${1}
-##cp linux.preset linux-BDisk.preset
-##sed -i -e 's#^[[:space:]]*install\ -D\ -m644\ "${srcdir}/linux.preset".*$#install -D -m644 "${srcdir}/linux-BDisk.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"#g' ${1}
-##sed -i -e "s/\ 'fallback'//g" \
-##-e '/^fallback/d' \
-##-e '/^$/d' \
-##-e '/^[[:space:]]*$/d' \
-##-e 's#^\(default_image="/boot/initramfs-linux\).*#\1-BDisk"/g' linux-BDisk.preset
-##-e 's/^\(ALL_kver="/boot/vmlinuz-linux\)\(.*\)/\1-BDisk\2/g' linux-BDisk.preset
-
-# add source for aufs3
-## 12.07.2014 - remove the "git checkout <SPECIFIC COMMIT HASH>" once a bug is fixed. currently fails with:
-##  LD      fs/aufs/built-in.o
-##  CC [M]  fs/aufs/module.o
-##In file included from fs/aufs/module.c:24:0:
-##fs/aufs/inode.h:307:12: error: function declaration isn't a prototype
-##[-Werror=strict-prototypes]
-## AuStubInt0(au_cpup_xattr, h_dst, h_src, ignore_flags)
-##            ^
-##fs/aufs/aufs.h:28:21: note: in definition of macro 'AuStub'
-##  static inline type name(__VA_ARGS__) { body; }
-##                     ^
-##fs/aufs/inode.h:307:1: note: in expansion of macro 'AuStubInt0'
-## AuStubInt0(au_cpup_xattr, h_dst, h_src, ignore_flags)
-## ^
-##cc1: some warnings being treated as errors
-##scripts/Makefile.build:257: recipe for target 'fs/aufs/module.o' failed
-##make[2]: *** [fs/aufs/module.o] Error 1
-##scripts/Makefile.build:404: recipe for target 'fs/aufs' failed
-##make[1]: *** [fs/aufs] Error 2
-##Makefile:929: recipe for target 'fs' failed
-##make: *** [fs] Error 2
-sed -i -e '/^prepare()\ {/a\
-\ git clone git:\/\/aufs.git.sourceforge.net\/gitroot\/aufs\/aufs3-standalone.git aufs3  > \/dev\/null 2>&1\
-\ cd aufs3\
-\ git checkout aufs${KERNVER} > \/dev\/null 2>&1\
-\ git checkout c75f6dddc1c58950c76cc1581e4b4c7ac8365bff > \/dev\/null 2>&1\
-\ cd ..\/' ${1}
-#sed -i -e 's/^\(_kernelname=\).*$/\1"-BDisk"/' ${1}
-sed -i -e '/^[[:space:]]*patch.*pkgver}"$/i rsync -a ../aufs3/Documentation/. Documentation/. ; rsync -a ../aufs3/fs/. fs/. ; cp -a ../aufs3/include/uapi/linux/aufs_type.h include/uapi/linux/. \
-\ for i in $(ls -1 ../aufs3/*.patch) ; do patch -p1 -i ../aufs3/${i} ; done' ${1}
-# and we need to be sure to build aufs3-util
-#sed -i -e '/^[[:space:]]*install\ -D\ -m644\ vmlinux.*$/a\
-#\ git clone git:\/\/git.code.sf.net\/p\/aufs\/aufs-util > \/dev\/null 2>&1\
-#\ cd aufs-util\
-#\ UTILVER=$(git branch -a | grep -v master | sort -nr | grep -v rcN | head -n1 | cut -f3 -d"\/")\
-#\ git checkout ${UTILVER} > \/dev\/null 2>&1\
-#\ make' ${1}
-
-# and configure the kernel. this gets messy.
-#-e "s/^#[[:space:]]\\\(CONFIG_AUFS_FS\\\).*$/\\\1=m/g" \\\
-sed -i -e '/^[[:space:]]*make\ prepare.*$/i yes "" | make olddefconfig >/dev/null' ${1}
-sed -i -e '/^[[:space:]]*make\ prepare.*$/a sed -i \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FS\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BRANCH_MAX_127\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_SBILIST\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HFSNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_EXPORT\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_INO_T_64\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FHSM\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_RDU\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BDEV_LOOP\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_511\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_1023\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_32767\\\).*$/\\\1=n/g" ${srcdir}/../config{,.x86_64}' ${1}
-# yes, we have to do this twice. with a hammer.
-sed -i -e '/^[[:space:]]*make\ prepare.*$/a sed -i \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FS\\\).*$/\\\1=m/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BRANCH_MAX_127\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_SBILIST\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HFSNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_EXPORT\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_INO_T_64\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FHSM\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_RDU\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BDEV_LOOP\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_511\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_1023\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_32767\\\).*$/\\\1=n/g" .config' ${1}
-sed -i -e 's/^\([[:space:]]*yes\ ""\ |\ \)make\ config/\1make olddefconfig/' ${1}
-# and we have to edit the linux.install as well.
-sed -i -e 's/^\(KERNEL_NAME=\).*$/\1-BDisk/g' linux.install*

extra/pre-build.d/etc/customizepkg.d/wifite-mod-pixiewps-git

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -e 's/any/x86_64/g' ${1}

extra/pre-build.d/etc/mkinitcpio.conf

@@ -3,7 +3,7 @@
 # run.  Advanced users may wish to specify all system modules
 # in this array.  For instance:
 #     MODULES="piix ide_disk reiserfs"
-MODULES="aufs ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
+MODULES="overlay ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
 
 # BINARIES
 # This setting includes any additional binaries a given user may
@@ -50,7 +50,7 @@ FILES=""
 #    usr, fsck and shutdown hooks.
 #HOOKS="base udev autodetect modconf block filesystems keyboard fsck"
 #HOOKS="base udev memdisk archiso_shutdown archiso modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd"
-HOOKS="base udev memdisk archiso_shutdown archiso-custom modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd"
+HOOKS="base udev memdisk archiso_shutdown archiso-custom modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_http_custom archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd"
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression

extra/pre-build.d/etc/mkinitcpio.d/linux.preset

@@ -0,0 +1,15 @@
+# mkinitcpio preset file for the 'linux' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-linux"
+
+#PRESETS=('default' 'fallback')
+PRESETS=('default')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-linux.img"
+#default_options=""
+
+#fallback_config="/etc/mkinitcpio.conf"
+#fallback_image="/boot/initramfs-linux-fallback.img"
+#fallback_options="-S autodetect"

extra/pre-build.d/etc/resolvconf.conf

@@ -0,0 +1,8 @@
+# Configuration for resolvconf(8)
+# See resolvconf.conf(5) for details
+
+resolv_conf=/etc/resolv.conf
+# If you run a local name server, you should uncomment the below line and
+# configure your subscribers configuration files below.
+#name_servers=127.0.0.1
+append_nameservers='4.2.2.1 4.2.2.2 4.2.2.3'

extra/pre-build.d/root/post-build.sh

@@ -4,24 +4,5 @@ set -e
 
 apacman --noconfirm --noedit -S --needed customizepkg-scripting
 
-echo -n "Compiling kernel sources..."
-set +e
-## Uncomment below and remove manual ABS/makepkg when https://github.com/oshazard/apacman/issues/2 is fulfulled
-#apacman --noconfirm --noedit -S --needed linux
-
-export ABSROOT=/tmp
-abs core/linux
-
-cd /tmp/core/linux
-customizepkg --modify
-
-chown -R nobody:nobody /tmp/core/linux
-sudo -u nobody makepkg
-set -e
-
-for i in $(ls -1 linux-*.pkg.tar.xz | sort);
-do
- pacman --noconfirm -U ${i}
-done
 
 echo "Done."

extra/pre-build.d/usr/lib/initcpio/hooks/archiso-custom

@@ -11,19 +11,13 @@ _mnt_fs() {
     ro_dev=$(losetup --find --show --read-only "${img}")
     echo ${ro_dev} >> /run/archiso/used_block_devices
     ro_dev_size=$(blockdev --getsz ${ro_dev})
-    if [[ "${cowfile_size}" == "100" ]]; then
-        rw_dev_size=${ro_dev_size}
-    else
-        # size calculation done in this way to avoid integer overflow when ro_dev_size is > 10.2G
-        rw_dev_size=$((ro_dev_size/100*cowfile_size))
-    fi
 
     if [[ "${cow_persistent}" == "P" ]]; then
         if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
             msg ":: Found '/run/archiso/cowspace/${cow_directory}/${img_name}.cow', using as persistent."
         else
             msg ":: Creating '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' as persistent."
-            dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null
+            truncate -s "${cowfile_size}" "/run/archiso/cowspace/${cow_directory}/${img_name}.cow"
         fi
     else
         if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
@@ -31,13 +25,13 @@ _mnt_fs() {
             rm -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow"
         fi
         msg ":: Creating '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent."
-        dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null
+        truncate -s "${cowfile_size}" "/run/archiso/cowspace/${cow_directory}/${img_name}.cow"
     fi
 
     rw_dev=$(losetup --find --show "/run/archiso/cowspace/${cow_directory}/${img_name}.cow")
     echo ${rw_dev} >> /run/archiso/used_block_devices
 
-    echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8" | dmsetup create ${dm_snap_name}
+    dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8"
 
     _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w"
     echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/archiso/used_block_devices
@@ -52,7 +46,8 @@ _mnt_sfs() {
 
     if [[ "${copytoram}" == "y" ]]; then
         msg -n ":: Copying squashfs image to RAM..."
-        if ! cp "${img}" "/run/archiso/copytoram/${img_fullname}" ; then
+        #if ! cp "${img}" "/run/archiso/copytoram/${img_fullname}" ; then
+        if ! pv -pterabT "${img}" > "/run/archiso/copytoram/${img_fullname}" ; then
             echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'"
             launch_interactive_shell
         fi
@@ -108,9 +103,7 @@ run_hook() {
     [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
     [[ -z "${archisodevice}" ]] && archisodevice="/dev/disk/by-label/${archisolabel}"
     if [[ -z "${cowfile_size}" ]]; then
-        cowfile_size="100"
-    else
-        cowfile_size=${cowfile_size/%}
+        cowfile_size="256M"
     fi
 
     if [[ -n "${cow_label}" ]]; then
@@ -175,8 +168,8 @@ archiso_mount_handler() {
     mkdir -p "/run/archiso/cowspace/${cow_directory}"
 
     _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/sfs/airootfs"
-   # _mnt_fs "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/"
-    mount --bind "run/archiso/sfs/airootfs" "/new_root"
+    #_mnt_fs "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/"
+    mount --bind "/run/archiso/sfs/airootfs" "/new_root"
 
     if [[ "${copytoram}" == "y" ]]; then
         umount /run/archiso/bootmnt

extra/pre-build.d/usr/lib/initcpio/hooks/archiso_http_custom

@@ -0,0 +1,49 @@
+# vim: set ft=sh:
+
+run_hook() {
+    if [[ -n "${ip}" && -n "${archiso_http_srv}" ]]; then
+
+        archiso_http_srv=$(eval echo ${archiso_http_srv})
+        [[ -z "${archiso_http_spc}" ]] && archiso_http_spc="75%"
+
+        mount_handler="archiso_pxe_http_mount_handler"
+    fi
+}
+
+# Fetch a file with CURL
+#
+# $1 URL
+# $2 Destination directory inside httpspace/${archisobasedir}
+_curl_get() {
+    local _url="${1}"
+    local _dst="${2}"
+
+    msg ":: Downloading image"
+    if ! curl -L -f -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
+        echo "ERROR: Downloading failed."
+        #echo "   Falling back to interactive prompt"
+        #echo "   You can try to fix the problem manually, log out when you are finished"
+        #launch_interactive_shell
+	sleep 4
+	reboot -f
+    fi
+}
+
+archiso_pxe_http_mount_handler () {
+    newroot="${1}"
+
+    msg ":: Mounting /run/archiso/httpspace (tmpfs) filesystem, size='${archiso_http_spc}'"
+    mkdir -p "/run/archiso/httpspace"
+    mount -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/run/archiso/httpspace"
+
+    _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs" "/${arch}"
+
+    if [[ "${checksum}" == "y" ]]; then
+        _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.md5" "/${arch}"
+    fi
+
+    mkdir -p "/run/archiso/bootmnt"
+    mount -o bind /run/archiso/httpspace /run/archiso/bootmnt
+
+    archiso_mount_handler ${newroot}
+}

extra/pre-build.d/usr/lib/initcpio/hooks/livecd

@@ -1,15 +1,18 @@
 # vim: set ft=sh:
 
 run_cleanuphook () {
-        msg ":: Mounting aufs on / with tmpfs=rw, ${root}=ro ..."
-        modprobe aufs
+        msg ":: Mounting OverlayFS on / with tmpfs=rw, ${root}=ro ..."
+        modprobe overlay
 
-	echo "Now attempting aufs mount..."
+	echo "Now attempting overlay mount..."
 
-	mkdir /new_root.hw
-	mount --move /new_root /new_root.hw
-	mkdir /dev/shm
-	mount -t tmpfs none /dev/shm
-	mount -t aufs none /new_root -o dirs=/dev/shm=rw:/new_root.hw=ro -o noatime
+	#mkdir /new_root.hw
+	mkdir -p /run/archiso/cowspace/upperdir /run/archiso/cowspace/workdir
+	#mount --move /new_root /new_root.hw
+	#mkdir /dev/shm
+	#mount -t tmpfs none /dev/shm
+	#mount -t overlay overlay -olowerdir=/new_root.hw,upperdir=/new_root,workdir=/dev/shm -o noatime
+	umount -l /new_root > /dev/null 2>&1
+	mount -t overlay -o lowerdir=/run/archiso/sfs/airootfs,upperdir=/run/archiso/cowspace/upperdir,workdir=/run/archiso/cowspace/workdir airootfs /new_root
 	pkill -9 dropbear #kill SSH (in preparation for the live system starting ssh on port 22
 }

extra/pre-build.d/usr/lib/initcpio/install/archiso-custom

@@ -13,6 +13,7 @@ build() {
     add_binary losetup
     add_binary mountpoint
     add_binary truncate
+    add_binary pv
 
     add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
     add_file /usr/lib/udev/rules.d/10-dm.rules

extra/pre-build.d/usr/lib/initcpio/install/archiso_http_custom

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+build() {
+    add_runscript
+
+    add_binary curl
+}
+
+help() {
+cat<<HELPEOF
+  This hook loads the necessary modules for boot via PXE and HTTP.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

extra/pre-build.d/usr/lib/initcpio/install/livecd

@@ -4,7 +4,7 @@ build()
 {
 	add_module 'squashfs'
 	add_module 'loop'
-	add_module 'aufs'
+	add_module 'overlay'
 
         add_binary "sed"
         add_binary "pkill"
@@ -16,6 +16,6 @@ build()
 help() 
 {
         cat <<HELPEOF
-Mount a squashed flat-file directory with AUFS3 on /
+Mount a squashed flat-file directory with OverlayFS on /
 HELPEOF
 }

lib/00-depcheck.func.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# placeholder...

lib/01-mk.chroot.func.sh

@@ -74,7 +74,8 @@ function mkchroot {
  cd "${BASEDIR}"
  
  ## Set some vars.
- MIRROR='http://mirrors.kernel.org/archlinux'
+ #MIRROR='http://mirrors.kernel.org/archlinux'
+ MIRROR='http://mirror.us.leaseweb.net/archlinux'
  RLSDIR="${MIRROR}/iso/latest"
  
  CURRLS64=$(curl -s ${RLSDIR}/sha1sums.txt | grep bootstrap | awk '{print $2}' | grep 'x86_64')
@@ -93,10 +94,10 @@ function mkchroot {
     echo "Local: ${LOCSUM64}"
     echo "Remote: ${CKSUM64}"
     echo "Fetching fresh copy."
-    curl -o latest.64.tar.gz "${RLSDIR}/${CURRLS64}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    curl -o latest.64.tar.gz "${RLSDIR}/${CURRLS64}"
   fi
  else
-  curl -o latest.64.tar.gz "${RLSDIR}/${CURRLS64}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  curl -o latest.64.tar.gz "${RLSDIR}/${CURRLS64}"
  fi
  
  if [ -f "latest.32.tar.gz" ];
@@ -153,6 +154,12 @@ EOF
    
    for i in ${CHROOTDIR32} ${CHROOTDIR64};
    do
+    # Disable NetworkManager. Fuck that shit.
+    ln -s /dev/null ${i}/etc/systemd/system/NetworkManager.service
+    ln -s /dev/null ${i}/etc/systemd/system/NetworkManager-dispatcher.service
+    # Remove the machine-id file so it's automatically generated.
+    # NOTE: this kind of fucks things up presently.
+    #rm -f ${i}/etc/machine-id
     # Prep pacman
     echo "Prepping ${i}. This will take a while..."
     echo -n "...Key initializing..."
@@ -167,7 +174,7 @@ EOF
     # if that doesn't work,
     ${CHROOTCMD} ${i}/ pacman -Syy >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
-    ${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed base syslinux wget rsync unzip jshon sed sudo abs xmlto bc >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed base syslinux wget rsync unzip jshon sed sudo abs xmlto bc docbook-xsl git >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     echo "Done."
     echo -n "...Upgrading any outdated packages..."
@@ -182,11 +189,12 @@ EOF
     ## https://projects.archlinux.org/pacman.git/tree/NEWS#n54
     ## https://bugs.archlinux.org/task/43302
     #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    mkdir ${i}/var/tmp/pkg
+    mkdir -p ${i}/var/tmp/pkg
     cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/var/tmp/pkg/apacman.tar.xz
     #${CHROOTCMD} ${i} "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    ${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    ${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz && mkdir /var/tmp/apacman && chmod 0750 /var/tmp/apacman && chown root:aurbuild /var/tmp/apacman " >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
+    ${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit --skipinteg -S apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     #rm -rf ${i}/var/tmp/pkg
     #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
@@ -211,19 +219,21 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.both | tr '\n' ' ')
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
-    echo "Running post-build tasks (building kernel, etc.) in ${i}..."
+    echo "Running post-build tasks in ${i}..."
     ${CHROOTCMD} ${i}/ "/root/post-build.sh" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
-    #set +e
-    #${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    #set -e
-    #for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
+    set +e
+    ${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
+    cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
+    set -e
+    for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     # Uncomment if you wish to use the mkpasswd binary from within the chroot...
-    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit -S --needed debian-whois-mkpasswd" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed debian-whois-mkpasswd" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     #for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     echo -n "Regular packages..."
     set +e
-    ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     # User creation
     set -e
@@ -260,7 +270,11 @@ EOF
  
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
-  ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  set +e
+  for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+  ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
+  set -e
  done
  
  # 32-bit
@@ -268,7 +282,7 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR32}/ /usr/bin/bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR32}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  set +e
  for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
@@ -280,7 +294,7 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR64}/ /usr/bin/bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR64}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  set +e
  for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done

lib/03-holla_atcha_boi.func.sh

@@ -13,7 +13,7 @@ function holla_atcha_boi {
   then
     echo "No existing chroot environment found. Creating..."
     rm -f ${LOCKFILE}
-    ${RACECAR_CHK} ${BASEDIR}/lib/mk.chroot.sh
+    ${RACECAR_CHK} ${BASEDIR}/lib/01-mk.chroot.func.sh
     touch ${LOCKFILE}
   fi
 }

lib/07-jenny_craig.func.sh

@@ -38,7 +38,8 @@ function jenny_craig () {
   #rm -f ${BUILDDIR}/etc/localtime
   rm -f ${BUILDDIR}/root/.bashrc
   # DISABLE when no longer building custom kernel
-  find ${BUILDDIR}/usr/lib/modules/ -maxdepth 1 -iname "*-ARCH" -exec rm -rf '{}' \;
+  #find ${BUILDDIR}/usr/lib/modules/ -maxdepth 1 -iname "*-ARCH" -exec rm -rf '{}' \;
+  for i in $(ls -1t ${BUILDDIR}/usr/lib/modules | tail -n "+2") ; do rm -rf ${BUILDDIR}/usr/lib/modules/${i} ; done
   find ${BUILDDIR}/ -type f -name "*.pacnew" -exec rm -rf '{}' \;
   sed -i -e '/^MAKEFLAGS=.*$/d' ${BUILDDIR}/etc/makepkg.conf
   rm -rf ${BUILDDIR}/usr/share/locale/*

lib/08-centos_is_stupid.func.sh

@@ -51,7 +51,7 @@ function centos_is_stupid {
     then
       echo "Boy howdy. We need to compile a custom version of the squashfs-tools because you aren't running a version that supports XZ. Give me a second."
       set -e
-      mkdir -p ${SRCDIR} ${ROOTDIR}/bin
+      mkdir -p ${SRCDIR} ${BASEDIR}/bin
       cd ${SRCDIR}
       #wget --quiet -O squashfs4.2.tar.gz "http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs4.2/squashfs4.2.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fsquashfs%2Ffiles%2F&ts=1387047818&use_mirror=hivelocity"
       curl -o squashfs4.2.tar.gz "http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs4.2/squashfs4.2.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fsquashfs%2Ffiles%2F&ts=1387047818&use_mirror=hivelocity" >> "${LOGFILE}.${FUNCNAME}" 2>&1

lib/09-will_it_blend.func.sh

@@ -43,6 +43,11 @@ function will_it_blend () {
   local BUILDDIR="${BUILDDIR}${ARCHSUFFIX}"
 
   # now let's build the squashed image... and generate some checksums as well to verify download integrity.
+  # are we building split-arch ISOs? do we need the below?
+  #if [[ "${MULTIARCH}" == "n" ]];
+  #then
+  # rm -rf ${ARCHBOOT}
+  #fi
   mkdir -p ${ARCHBOOT}/${AIROOT}
   
   if [ ! -f "${ARCHBOOT}/${AIROOT}/airootfs.sfs" ] || [ "${CHROOTDIR}/root/.bash_history" -nt "${ARCHBOOT}/${AIROOT}/airootfs.sfs" ];
@@ -52,14 +57,14 @@ function will_it_blend () {
    cd ${ARCHBOOT}/${AIROOT}
    ${RACECAR_CHK}sha256sum airootfs.sfs >> airootfs.sha256
    ${RACECAR_CHK}md5sum airootfs.sfs >> airootfs.md5
-   cd ${ROOTDIR}
+   cd ${BASEDIR}
   else
-   cd ${ROOTDIR}
+   cd ${BASEDIR}
   fi
 
   # Generate the mtree spec.
   # Not really necessary anymore.
-  #mtree -c -p ${ROOTDIR}/chroot -K flags,gid,mode,nlink,uid,link,time,type > ${ROOTDIR}/extra/mtree.spec
+  #mtree -c -p ${BASEDIR}/chroot -K flags,gid,mode,nlink,uid,link,time,type > ${BASEDIR}/extra/mtree.spec
 
   # and now we copy stuff into the live directories
   echo "[${ARCHSUFFIX}-bit] Copying files for PXE, and ISO building, please be patient."

lib/10-stuffy.func.sh

@@ -32,16 +32,16 @@ function stuffy {
   # now for setting up loader config/entries. maybe add memtest or something in the future? i dunno.
   cat > ${TEMPDIR}/loader/loader.conf << EOF
 timeout 3
-default ${UXNAME}_ram
+default ${UXNAME}
 EOF
   cat > ${TEMPDIR}/loader/entries/${UXNAME}_ram.conf << EOF
-title   ${PNAME}
+title   ${PNAME} (RAM)
 linux   /boot/${UXNAME}.kern
 initrd  /boot/${UXNAME}.img
 options copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
 EOF
   cat > ${TEMPDIR}/loader/entries/${UXNAME}.conf << EOF
-title   ${PNAME} (Run from media)
+title   ${PNAME} (Media)
 linux   /boot/${UXNAME}.kern
 initrd  /boot/${UXNAME}.img
 options archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -59,29 +59,42 @@ EOF
   # create the embedded efiboot FAT stuff
   # how big should we make the disk?
   echo "Generating the EFI embedded FAT filesystem..."
-  FTSIZE=$(du -sc ${TEMPDIR}/{boot,EFI,loader} | tail -n1 | awk '{print $1}')
-  FATSIZE=$((${FTSIZE} + 64)) # let's give a little wiggle room
-  ${RACECAR_CHK}truncate -s "${FATSIZE}"K ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img
-  ${RACECAR_CHK}mkfs.vfat -n ${DISTNAME}_EFI ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  # are we building split-arch ISOs?
+  if [[ "${MULTIARCH}" == "n" ]];
+  then
+   rm -f ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img
+  fi
+  # now we need to calculate the space for various files we're going to include...
+  FATSIZE=$(stat --format="%s" ${TEMPDIR}/boot/${UXNAME}.64.kern) # EFI/BDISK/bdisk.efi
+  FATSIZE=$((${FATSIZE} + $(stat --format="%s" ${TEMPDIR}/boot/${UXNAME}.64.img))) # EFI/BDISK/bdisk.img
+  FATSIZE=$((${FATSIZE} + $(stat --format="%s" ${BASEDIR}/root.x86_64/usr/lib/prebootloader/PreLoader.efi))) # EFI/boot/bootx64.efi
+  FATSIZE=$((${FATSIZE} + $(stat --format="%s" ${BASEDIR}/root.x86_64/usr/lib/prebootloader/HashTool.efi))) # EFI/boot/HashTool.efi
+  FATSIZE=$((${FATSIZE} + $(stat --format="%s" ${BASEDIR}/root.x86_64/usr/lib/gummiboot/gummibootx64.efi))) # EFI/boot/loader.efi
+  FATSIZE=$((${FATSIZE} + $(stat --format="%s" ${TEMPDIR}/EFI/shellx64_v1.efi)))
+  FATSIZE=$((${FATSIZE} + $(stat --format="%s" ${TEMPDIR}/EFI/shellx64_v2.efi)))
+  FATSIZE=$((${FATSIZE} + $(du -sb ${TEMPDIR}/loader | tail -n1 | awk '{print $1}'))) # loader/* (okay so i cheated a little here.)
+  FATSIZE=$((${FATSIZE} + 786432)) # let's give a little wiggle room; 768k should do it. -_-
+  ${RACECAR_CHK}truncate -s "${FATSIZE}" ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img
+  ${RACECAR_CHK}mkfs.vfat -F 32 -n ${DISTNAME}_EFI ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img >> "${LOGFILE}.${FUNCNAME}" 2>&1
   mkdir -p ${SRCDIR}/efiboot
   mount ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img ${SRCDIR}/efiboot
   mkdir -p ${SRCDIR}/efiboot/EFI/${DISTNAME}
   cp ${TEMPDIR}/boot/${UXNAME}.64.kern ${SRCDIR}/efiboot/EFI/${DISTNAME}/${UXNAME}.efi
   cp ${TEMPDIR}/boot/${UXNAME}.64.img ${SRCDIR}/efiboot/EFI/${DISTNAME}/${UXNAME}.img
   mkdir -p ${SRCDIR}/efiboot/{EFI/boot,loader/entries}
-  # GETTING DEJA VU HERE.
+# GETTING DEJA VU HERE.
   cat > ${SRCDIR}/efiboot/loader/loader.conf << EOF
 timeout 3
-default ${UXNAME}_ram
+default ${UXNAME}
 EOF
   cat > ${SRCDIR}/efiboot/loader/entries/${UXNAME}_ram.conf << EOF
-title   ${PNAME}
+title   ${PNAME} (RAM)
 linux   /EFI/${DISTNAME}/${UXNAME}.efi
 initrd  /EFI/${DISTNAME}/${UXNAME}.img
 options copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
 EOF
   cat > ${SRCDIR}/efiboot/loader/entries/${UXNAME}.conf << EOF
-title   ${PNAME} (Run from media)
+title   ${PNAME} (Media)
 linux   /EFI/${DISTNAME}/${UXNAME}.efi
 initrd  /EFI/${DISTNAME}/${UXNAME}.img
 options archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -98,7 +111,7 @@ EOF
   cp ${BASEDIR}/root.x86_64/usr/lib/prebootloader/PreLoader.efi ${SRCDIR}/efiboot/EFI/boot/bootx64.efi
   cp ${BASEDIR}/root.x86_64/usr/lib/prebootloader/HashTool.efi ${SRCDIR}/efiboot/EFI/boot/.
   cp ${BASEDIR}/root.x86_64/usr/lib/gummiboot/gummibootx64.efi ${SRCDIR}/efiboot/EFI/boot/loader.efi # TODO: can i use syslinux.efi instead?
-  cp ${TEMPDIR}/EFI/shellx64_v* ${SRCDIR}/efiboot/EFI/.
+  cp ${TEMPDIR}/EFI/shellx64_v{1,2}.efi ${SRCDIR}/efiboot/EFI/.
   umount ${SRCDIR}/efiboot
   echo "EFI configuration complete..."
 

lib/11-yo_dj.func.sh

@@ -3,6 +3,9 @@ function yo_dj () {
   echo "Building the actual .iso image. This may take a while."
   im_batman
   ISOFILENAME="${UXNAME}-${VERSION}.iso"
+  #MINIFILENAME="${UXNAME}-${VERSION}-mini.iso"
+  MINIFILENAME="${UXNAME}-mini.iso"
+  USBFILENAME="${UXNAME}-mini.usb.img"
   if [[ "${MULTIARCH}" == "y" ]];
   then
     ISOFILENAME="${UXNAME}-${VERSION}-any.iso"
@@ -60,7 +63,7 @@ MENU BACKGROUND /${UXNAME}.png
 LABEL check
   MENU LABEL Your best supported kernel should be detected automatically.
   COM32 ifcpu64.c32
-  APPEND ${UXNAME}_ram_64 -- ${UXNAME}_ram_32
+  APPEND ${UXNAME}_64 -- ${UXNAME}_32
   MENU DEFAULT
 
 
@@ -84,10 +87,10 @@ MENU SEPARATOR
 ## 64 BIT
 MENU BEGIN 64BIT
 MENU LABEL ^1) 64-Bit ...
-ONTIMEOUT ${UXNAME}_ram_64
+ONTIMEOUT ${UXNAME}_64
   
 LABEL ${UXNAME}_ram_64
-  MENU LABEL ^1) ${PNAME} (run from RAM) (Default)
+  MENU LABEL ^1) ${PNAME} (run from RAM)
   LINUX /boot/${UXNAME}.64.kern
   INITRD /boot/${UXNAME}.64.img
   APPEND copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -97,7 +100,7 @@ LABEL ${UXNAME}_ram_64
   MENU DEFAULT
 
 LABEL ${UXNAME}_64 
-  MENU LABEL ^1) ${PNAME}
+  MENU LABEL ^1) ${PNAME} (Default)
   LINUX /boot/${UXNAME}.64.kern
   INITRD /boot/${UXNAME}.64.img
   APPEND archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -110,11 +113,11 @@ MENU END
 
 MENU BEGIN 32BIT
 MENU LABEL ^2) 32-Bit ...
-ONTIMEOUT ${UXNAME}_ram_32
+ONTIMEOUT ${UXNAME}_32
 
 ## 32 BIT
 LABEL ${UXNAME}_ram_32
-  MENU LABEL ^1) ${PNAME} (run from RAM) (Default)
+  MENU LABEL ^1) ${PNAME} (run from RAM)
   LINUX /boot/${UXNAME}.32.kern
   INITRD /boot/${UXNAME}.32.img
   APPEND copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -124,7 +127,7 @@ LABEL ${UXNAME}_ram_32
   MENU DEFAULT
 
 LABEL ${UXNAME}_32 
-  MENU LABEL ^2) ${PNAME}
+  MENU LABEL ^2) ${PNAME} (Default)
   LINUX /boot/${UXNAME}.32.kern
   INITRD /boot/${UXNAME}.32.img
   APPEND archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -188,10 +191,10 @@ MENU SEPARATOR
 
 MENU BEGIN ${ARCH}BIT
 MENU LABEL ^1) ${ARCH}-Bit ...
-ONTIMEOUT ${UXNAME}_ram_${ARCH}
+ONTIMEOUT ${UXNAME}_${ARCH}
   
 LABEL ${UXNAME}_ram_${ARCH}
-  MENU LABEL ^1) ${PNAME} (run from RAM) (Default)
+  MENU LABEL ^1) ${PNAME} (run from RAM)
   LINUX /boot/${UXNAME}.${ARCH}.kern
   INITRD /boot/${UXNAME}.${ARCH}.img
   APPEND copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -201,7 +204,7 @@ LABEL ${UXNAME}_ram_${ARCH}
   MENU DEFAULT
 
 LABEL ${UXNAME}_${ARCH} 
-  MENU LABEL ^1) ${PNAME}
+  MENU LABEL ^1) ${PNAME} (Default)
   LINUX /boot/${UXNAME}.${ARCH}.kern
   INITRD /boot/${UXNAME}.${ARCH}.img
   APPEND archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -248,7 +251,7 @@ EOF
 
   cd ..
   ${RACECAR_CHK}xorriso -as mkisofs \
--quiet \
+`#-quiet` \
 `#-joliet` \
 `#-rock` \
 `#-omit-version-number` \
@@ -274,23 +277,77 @@ EOF
 -isohybrid-gpt-basdat \
 -output "${ISODIR}/${ISOFILENAME}" "${TEMPDIR}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
 
+  ## Build the mini-ISO ##
+  if [[ "${BUILDMINI}" == "y" ]];
+  then
+    echo "Now generating the iPXE images; please wait..."
+    git submodule init >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    git submodule update >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    cd ${BASEDIR}/src/ipxe/src
+    git clean -xdf > /dev/null 2>&1
+    git reset --hard HEAD >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    git pull >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    for i in $(find ${BASEDIR}/src/ipxe_local/patches/ -type f -iname "*.patch" -printf '%P\n' | sort);
+    do
+      patch -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    done
+    #make everything EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    make bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    make bin/ipxe.eiso bin/ipxe.usb EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    # Change this to USB-only...
+    #make all EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.usb  ${ISODIR}/${USBFILENAME}
+    mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.eiso  ${ISODIR}/${MINIFILENAME}
+    make clean >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    git reset --hard >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    git clean -xdf > /dev/null 2>&1
+    git checkout master > /dev/null 2>&1
+    #git reset --hard HEAD > /dev/null 2>&1
+    echo
+  fi
 
   #isohybrid ${ISOFILENAME}
   cd ${ISODIR}
   ${RACECAR_CHK}sha256sum ${ISOFILENAME} > ${ISOFILENAME}.sha256
+  if [[ "${BUILDMINI}" == "y" ]];
+  then
+    ${RACECAR_CHK}sha256sum ${MINIFILENAME} > ${MINIFILENAME}.sha256
+    ${RACECAR_CHK}sha256sum ${USBFILENAME} > ${USBFILENAME}.sha256
+  fi
   cd ..
-  echo "ISO generated; size is $(ls -lh ${ISODIR}/${ISOFILENAME} | awk '{print $5}')."
-  echo "SHA256 sum is: $(awk '{print $1}' ${ISODIR}/${ISOFILENAME}.sha256)"
-  echo "You can find it at ${ISODIR}/${ISOFILENAME}"
+  echo "=ISO="
+  echo "Size: $(ls -lh ${ISODIR}/${ISOFILENAME} | awk '{print $5}')"
+  echo "SHA256: $(awk '{print $1}' ${ISODIR}/${ISOFILENAME}.sha256)"
+  echo "Location: ${ISODIR}/${ISOFILENAME}"
+  if [[ "${BUILDMINI}" == "y" ]];
+  then
+    echo "=Mini="
+    echo "Size: $(ls -lh ${ISODIR}/${MINIFILENAME} | awk '{print $5}')"
+    echo "SHA256: $(awk '{print $1}' ${ISODIR}/${MINIFILENAME}.sha256)"
+    echo "Location: ${ISODIR}/${MINIFILENAME}"
+    echo "=Mini USB="
+    echo "Size: $(ls -lh ${ISODIR}/${USBFILENAME} | awk '{print $5}')"
+    echo "SHA256: $(awk '{print $1}' ${ISODIR}/${USBFILENAME}.sha256)"
+    echo "Location: ${ISODIR}/${USBFILENAME}"
+  fi
   #rm -rf ${TEMPDIR}/*
 
   # are we rsyncing?
   if [ -n "${RSYNC_HOST}" ];
   then
-   rsync -a ${TFTPDIR}/. ${RSYNC_HOST}:${RSYNC_DEST}/tftpboot/.
-   rsync -a ${HTTPDIR}/. ${RSYNC_HOST}:${RSYNC_DEST}/http/.
+   echo
+   echo "Now sending to ${RSYNC_HOST} via rsync. This may take a while..."
+   echo "Sending TFTP files..."
+   rsync -az --info=progress2 ${TFTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/.
+   echo "Sending HTTP files..."
+   rsync -az --info=progress2 ${HTTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/.
 #   rsync -a  ${TEMPDIR}/boot/${UXNAME}.* ${RSYNC_HOST}:${RSYNC_DEST}/http/.
-   rsync -a ${ISODIR}/. ${RSYNC_HOST}:${RSYNC_DEST}/iso/.
-   rsync -a ${ROOTDIR}/extra/. ${RSYNC_HOST}:${RSYNC_DEST}/extra/.
+   echo "Sending the image files..."
+   rsync -az --info=progress2 ${ISODIR} ${RSYNC_HOST}:${RSYNC_DEST}/.
+   echo "Sending extra files..."
+   rsync -az --info=progress2 ${BASEDIR}/extra/packages.* ${RSYNC_HOST}:${RSYNC_DEST}/.
+   rsync -az --info=progress2 ${BASEDIR}/VERSION_INFO.txt ${RSYNC_HOST}:${RSYNC_DEST}/.
   fi
 }

lib/12-mentos.func.sh

@@ -37,20 +37,13 @@ function mentos {
     local MIRROR=$(egrep '^Server' ${i}/etc/pacman.d/mirrorlist | head -n1 | sed -e 's/^Server\ =\ //g  ; s#$repo.*#core/os/x86_64/#g')
     local NEWKERN=$(curl -s "${MIRROR}" | grep linux | awk '{print $3}' | cut -f2 -d\" | egrep '^linux-[0-9].*pkg.tar.xz$' | cut -f2 -d"-")
 
-    if [[ -n $(find ${BASEDIR}/extra/pre-build.d/ -type f -newer ${BASEDIR}/root.x86_64/boot/vmlinuz-linux-${PNAME}) ]] || [[ "${INSTKERN}" != "${NEWKERN}" ]];
-    then
-     ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -Syyua --devel" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    else
-     ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -Syyua --devel --ignore linux,linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    fi
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
-    ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -S --needed  --ignore linux,linux-${PNAME} ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --purgebuild --ignore linux ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
-    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}"
-    if [[ -n $(find ${BASEDIR}/extra/pre-build.d/ -type f -newer root.x86_64/boot/vmlinuz-linux-${PNAME}) ]];
-    then
-     ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}mkinitcpio -p linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    fi
+    ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}"
+    cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
+    cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
     echo "Done."
  done
  
@@ -60,7 +53,7 @@ function mentos {
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --purgebuild ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
 
@@ -69,10 +62,10 @@ function mentos {
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR64}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR64}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --purgebuild ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
- #${CHROOTCMD} ${CHROOTDIR64}/ bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}"
+ #${CHROOTCMD} ${CHROOTDIR64}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}"
  echo "Syncing overlay..."
  rsync -a ${BASEDIR}/overlay/64/. ${CHROOTDIR64}/.
  echo "Done."

overlay/etc/bash.bashrc

@@ -43,15 +43,21 @@ PS1='[\u@\h \W]\$ '
 export HISTTIMEFORMAT="%F %T "
 export PATH="${PATH}:/sbin:/bin:/usr/sbin"
 
+DEFROUTEIF=$(ip route show | egrep '^default' | awk '{print $5}')
+
 echo
 echo "==================================="
 date
+if [ -n "${DEFROUTEIF}" ];
+then
+ echo
+ echo -n "${DEFROUTEIF} is: "
+ ifconfig "${DEFROUTEIF}" | egrep 'inet|ether' | grep -v "inet6" | awk '{print $2}'
+fi
 echo
-echo "eth0 is:"
-ifconfig eth0 | egrep 'inet|ether' | grep -v "inet6" | awk '{print $2}'
-echo
-echo "tun0 is:"
+echo  -n "tun0 is:"
 ifconfig tun0 | grep inet | grep -v "inet6" | awk '{print $2}'
+echo
 echo "http://bdisk.square-r00t.net/"
 echo "==================================="
 echo

overlay/etc/systemd/scripts/livecd.fix.sh

@@ -7,3 +7,53 @@ chmod 700 /var/db/sudo/lectured
 chgrp bdisk /var/db/sudo/lectured/bdisk
 chmod 600 /var/db/sudo/lectured/bdisk
 chmod 4755 /usr/bin/sudo
+
+function fuck_you_gimme_net() {
+IFACE=$(ifconfig -a -s | egrep -E '^((en|wl)p?|em)' | awk '{print $1}' | tr '\n' ' ' | sed -e 's/\ $//g')
+for i in ${IFACE};
+do
+
+ LINK_STATE=$(ethtool ${i} | egrep '^[[:space:]]*Link' | sed -re 's/^[[:space:]]*Link detected:(.*)/\1/g')
+ DEV=$(echo ${i} | sed -re 's/^([A-Za-z]{1}).*/\1/g' | tr '[[:upper:]]' '[[:lower:]]' )
+ if [ "${DEV}" == "e" ];
+  then
+   if [ "${LINK_STATE}" != "no" ];
+   then
+    DEV='ethernet-dhcp'
+   else
+    # skip disconnected ethernet
+    continue
+   fi
+  else
+   DEV='wireless-open'
+  fi
+
+ ifconfig ${i} down
+ cp -a /etc/netctl/examples/${DEV} /etc/netctl/${i}
+ sed -i -re "s/^([[:space:]]*Interface[[:space:]]*=).*/\1${i}/g" /etc/netctl/${i}
+ if [ "${DEV}" == "wireless-open" ];
+ then
+  ifconfig ${i} up && \
+  ESSID=$(iwlist ${i} scanning | egrep -A5 -B5 '^[[:space:]]*Encryption key:off' | egrep '^[[:space:]]*ESSID:' | sed -re 's/^[[:space:]]*ESSID:(.*)/\1/g')
+  sed -i -re "s/^([[:space:]]*ESSID[[:space:]]*=).*/\1${ESSID}/g" /etc/netctl/${i}
+  ifconfig ${i} down
+ fi
+ netctl restart ${i} > /dev/null 2>&1
+ #cat /etc/resolvconf.conf.failover > /etc/resolvconf.conf
+ #resolvconf -u
+done
+}
+
+ping -c1 google.com | grep -q '1 received'
+if [[ "${?}" != "0" ]];
+then
+ fuck_you_gimme_net
+ systemctl restart openvpn@*
+fi
+
+# And lastly, do we need to set custom DNS servers?
+host -s -W1 bdisk.square-r00t.net | egrep -q '^bdisk\.square-r00t\.net\ has\ address'
+if [[ "${?}" != "0" ]];
+then
+ resolvconf -u
+fi

src/ipxe_local/EMBED

@@ -0,0 +1,4 @@
+#!ipxe
+
+dhcp
+chain http://bdisk.square-r00t.net

src/ipxe_local/credits.txt

@@ -0,0 +1,8 @@
+Thanks to "eworm" for his work on the AUR iPXE-git package:
+https://aur.archlinux.org/packages/ipxe-git/
+
+and specifically the following patches:
+http://www.eworm.de/download/linux/ipxe-0001-git-version.patch
+http://www.eworm.de/download/linux/ipxe-0002-banner.patch
+http://www.eworm.de/download/linux/ipxe-0003-iso-efi.patch
+http://www.eworm.de/download/linux/ipxe-0004-fix-no-pie-workaround.patch

src/ipxe_local/patches/ipxe-0001-git-version.patch

@@ -0,0 +1,32 @@
+From 4c139ece028b5dd6c4e5f46ce2bf8134c390de90 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Thu, 12 Feb 2015 08:59:37 +0100
+Subject: [PATCH] git version
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ src/Makefile | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index cf9cfd2..38ebb3d 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -194,10 +194,11 @@ VERSION_MINOR	= 0
+ VERSION_PATCH	= 0
+ EXTRAVERSION	= +
+ MM_VERSION	= $(VERSION_MAJOR).$(VERSION_MINOR)
+-VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
+ ifneq ($(wildcard ../.git),)
+-GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
+-VERSION		+= ($(GITVERSION))
++GITVERSION	:= $(shell git describe --tags --long 2>/dev/null)
++VERSION		= $(GITVERSION)
++else
++VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
+ endif
+ version :
+ 	@$(ECHO) "$(VERSION)"
+-- 
+2.3.0
+

src/ipxe_local/patches/ipxe-0002-banner.patch

@@ -0,0 +1,23 @@
+--- a/src/usr/autoboot.c	2015-06-29 04:18:17.055394598 -0400
++++ b/src/usr/autoboot.c	2015-06-29 22:04:28.692916217 -0400
+@@ -71,6 +71,7 @@
+ #define NORMAL	"\033[0m"
+ #define BOLD	"\033[1m"
+ #define CYAN	"\033[36m"
++#define BLUE	"\033[34m"
+ 
+ /** The "scriptlet" setting */
+ const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = {
+@@ -560,9 +561,9 @@
+ 	 * do so.
+ 	 *
+ 	 */
+-	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
+-		 NORMAL " -- " PRODUCT_TAG_LINE " -- "
+-		 CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
++	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
++		 CYAN PRODUCT_URI NORMAL "\n"
++		 BOLD BLUE "http://bdisk.square-r00t.net/" NORMAL "\n" );
+ 	for_each_table_entry ( feature, FEATURES )
+ 		printf ( " %s", feature->name );
+ 	printf ( "\n" );

src/ipxe_local/patches/ipxe-0003-iso-efi.patch

@@ -0,0 +1,128 @@
+From ddf6f6ac945654b00121ab899fb0bbb63293e51e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Tue, 7 Apr 2015 16:04:31 +0200
+Subject: [PATCH 1/2] [build] allow to build ISO image with EFI support
+ (ipxe.eiso)
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ src/arch/i386/Makefile.pcbios |  6 ++++++
+ src/util/geniso               | 39 ++++++++++++++++++++++++++++++---------
+ 2 files changed, 36 insertions(+), 9 deletions(-)
+
+diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios
+index ff82373..c7a58eb 100644
+--- a/src/arch/i386/Makefile.pcbios
++++ b/src/arch/i386/Makefile.pcbios
+@@ -59,6 +59,12 @@ NON_AUTO_MEDIA	+= iso
+ 	$(QM)$(ECHO) "  [GENISO] $@"
+ 	$(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" bash util/geniso -o $@ $<
+ 
++# rule to make a non-emulation ISO boot image with EFI support
++NON_AUTO_MEDIA	+= eiso
++%eiso:	%lkrn bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi util/geniso
++	$(QM)$(ECHO) "  [GENISO] $@"
++	$(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" bash util/geniso -e -o $@ $<
++
+ # rule to make a floppy emulation ISO boot image
+ NON_AUTO_MEDIA	+= liso
+ %liso:	%lkrn util/geniso
+diff --git a/src/util/geniso b/src/util/geniso
+index 521c929..998370d 100755
+--- a/src/util/geniso
++++ b/src/util/geniso
+@@ -6,16 +6,21 @@ function help() {
+ 	echo "usage: ${0} [OPTIONS] foo.lkrn [bar.lkrn,...]"
+ 	echo
+ 	echo "where OPTIONS are:"
++	echo " -e	build image with EFI support"
+ 	echo " -h       show this help"
+ 	echo " -l       build legacy image with floppy emulation"
+ 	echo " -o FILE  save iso image to file"
+ }
+ 
++EFI=0
+ LEGACY=0
+ FIRST=""
+ 
+-while getopts "hlo:" opt; do
++while getopts "ehlo:" opt; do
+ 	case ${opt} in
++		e)
++			EFI=1
++			;;
+ 		h)
+ 			help
+ 			exit 0
+@@ -37,23 +42,24 @@ if [ -z "${OUT}" ]; then
+ 	exit 1
+ fi
+ 
+-# There should either be mkisofs or the compatible genisoimage program
+-for command in genisoimage mkisofs; do
++# We require xorriso (from libisoburn) for EFI support
++# genisoimage and mkisofs are missing some features
++for command in xorriso; do
+ 	if ${command} --version >/dev/null 2>/dev/null; then
+-		mkisofs=(${command})
++		xorriso=(${command})
+ 		break
+ 	fi
+ done
+ 
+-if [ -z "${mkisofs}" ]; then
+-	echo "${0}: mkisofs or genisoimage not found, please install or set PATH" >&2
++if [ -z "${xorriso}" ]; then
++	echo "${0}: xorriso not found, please install or set PATH" >&2
+ 	exit 1
+ fi
+ 
+ dir=$(mktemp -d bin/iso.dir.XXXXXX)
+ cfg=${dir}/isolinux.cfg
+ 
+-mkisofs+=(-quiet -l -volid "iPXE" -preparer "iPXE build system"
++xorriso+=(-as mkisofs -quiet -l -volid "iPXE" -preparer "iPXE build system"
+ 	-appid "iPXE ${VERSION} - Open Source Network Boot Firmware"
+ 	-publisher "http://ipxe.org/" -c boot.cat)
+ 
+@@ -116,12 +122,27 @@ case "${LEGACY}" in
+ 		fi
+ 
+ 		# generate the iso image
+-		"${mkisofs[@]}" -b boot.img -output ${OUT} ${dir}
++		"${xorriso[@]}" -b boot.img -output ${OUT} ${dir}
+ 		;;
+ 	0)
+ 		# copy isolinux bootloader
+ 		cp ${ISOLINUX_BIN} ${dir}
+ 
++		xorriso+=(-b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table)
++
++		if [ "${EFI}" -eq 1 ]; then
++			# generate EFI image
++			img=${dir}/efiboot.img
++
++			mformat -f 2880 -C -i ${img} ::
++			mmd -i ${img} "::/EFI"
++			mmd -i ${img} "::/EFI/BOOT"
++			mcopy -m -i ${img} bin-x86_64-efi/ipxe.efi "::EFI/BOOT/BOOTX64.EFI"
++			mcopy -m -i ${img} bin-i386-efi/ipxe.efi "::EFI/BOOT/BOOTIA32.EFI"
++
++			xorriso+=(-eltorito-alt-boot -e efiboot.img -isohybrid-gpt-basdat -no-emul-boot)
++		fi
++
+ 		# syslinux 6.x needs a file called ldlinux.c32
+ 		LDLINUX_C32=$(dirname ${ISOLINUX_BIN})/ldlinux.c32
+ 		if [ -s ${LDLINUX_C32} ]; then
+@@ -129,7 +150,7 @@ case "${LEGACY}" in
+ 		fi
+ 
+ 		# generate the iso image
+-		"${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir}
++		"${xorriso[@]}" -output ${OUT} ${dir}
+ 
+ 		# isohybrid will be used if available
+ 		if isohybrid --version >/dev/null 2>/dev/null; then
+-- 
+2.3.5
+

src/ipxe_local/patches/ipxe-0004-fix-no-pie-workaround.patch

@@ -0,0 +1,34 @@
+From a4f7e3ba395af4cd0a706df635309d4ef837ecf8 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Wed, 8 Apr 2015 09:51:41 +0200
+Subject: [PATCH 2/2] Fix no-PIE workaround for i386 builds
+
+This workaround did not work for my version of gcc (4.9.2 20150304) as
+no option -nopie exists.
+
+We take another way: Let's check whether or not the macro __PIE__ is defined
+and add -fno-PIE if it is.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ src/arch/i386/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
+index 99f8753..897081b 100644
+--- a/src/arch/i386/Makefile
++++ b/src/arch/i386/Makefile
+@@ -75,8 +75,8 @@ CFLAGS			+= -Ui386
+ # output on stderr instead of checking the exit status.
+ #
+ ifeq ($(CCTYPE),gcc)
+-PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
+-PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
++PIE_TEST = $(CC) -dM -E - < /dev/null | grep -q '__PIE__'
++PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE')
+ WORKAROUND_CFLAGS += $(PIE_FLAGS)
+ endif
+ 
+-- 
+2.3.5
+