From 47e11125e4672fc3448caefa6728439160daedd3 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 28 Jul 2020 11:38:04 +0200 Subject: Copy files more generically configs/*: Copy all files that do not need a rename generically (not specifying a destination file name). Do not rename vmlinuz-linux to vmlinuz or vmlinuz.efi (as this serves no purpose and makes the scripts more complicated). Do not rename microcode (i.e. {amd,intel}-ucode.img) when copying them and change all boot loader configuration files that assume a renamed microcode image. Add note and link to Arch Linux wiki to state why memtest.bin is renamed to memtest. Copy license files for {amd,intel}-ucode and memtest more generically by placing them into subdirectories with the same name as the package (to circumenvent overwriting one other). Closes #33 --- configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf | 6 +++--- configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'configs/releng/efiboot') diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf index 7f5c81b..b660f1d 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -1,6 +1,6 @@ title Arch Linux install medium (x86_64, UEFI) -linux /EFI/archiso/vmlinuz.efi -initrd /EFI/archiso/intel_ucode.img -initrd /EFI/archiso/amd_ucode.img +linux /EFI/archiso/vmlinuz-linux +initrd /EFI/archiso/intel-ucode.img +initrd /EFI/archiso/amd-ucode.img initrd /EFI/archiso/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf index e1d156a..78c7d23 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -1,6 +1,6 @@ title Arch Linux install medium (x86_64, UEFI) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz -initrd /%INSTALL_DIR%/boot/intel_ucode.img -initrd /%INSTALL_DIR%/boot/amd_ucode.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% -- cgit v1.2.3-70-g09d2 From e264b44682a930f70715ea58cf96e69c87a86b64 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 30 May 2020 00:01:28 +0200 Subject: Add license and basic documentation LICENSE: Add GPL-3.0 license. {{archiso,configs}/*,.editorconfig,.gitlab-ci.yml}: Add SPDX license identifier. Makefile: Add SPDX license identifier. Install the `run_archiso.sh` script as global executable `run_archiso`. Use -D and -t flags to install to install files more generically (without a previous call to install the directory). README.rst: Add README outlining the project's scope, how to build images from the profiles and how to test. AUTHORS.rst: Add list of all direct contributors to the repository. CONTRIBUTING.rst: Add basic contribution guidelines, explaining the linter and the license in use. Closes #7 Closes #3 --- .editorconfig | 14 +- .gitlab-ci.yml | 2 + AUTHORS.rst | 33 + CONTRIBUTING.rst | 26 + LICENSE | 674 +++++++++++++++++++++ Makefile | 11 +- README.rst | 118 ++++ archiso/initcpio/hooks/archiso | 2 + archiso/initcpio/hooks/archiso_loop_mnt | 2 + archiso/initcpio/hooks/archiso_pxe_common | 2 + archiso/initcpio/hooks/archiso_pxe_http | 2 + archiso/initcpio/hooks/archiso_pxe_nbd | 2 + archiso/initcpio/hooks/archiso_pxe_nfs | 2 + archiso/initcpio/hooks/archiso_shutdown | 2 + archiso/initcpio/install/archiso | 2 + archiso/initcpio/install/archiso_kms | 2 + archiso/initcpio/install/archiso_loop_mnt | 2 + archiso/initcpio/install/archiso_pxe_common | 2 + archiso/initcpio/install/archiso_pxe_http | 2 + archiso/initcpio/install/archiso_pxe_nbd | 2 + archiso/initcpio/install/archiso_pxe_nfs | 2 + archiso/initcpio/install/archiso_shutdown | 2 + archiso/initcpio/script/archiso_shutdown | 2 + archiso/mkarchiso | 2 + configs/baseline/build.sh | 2 + configs/baseline/isolinux/isolinux.cfg | 3 + configs/baseline/mkinitcpio.conf | 3 + configs/baseline/packages.x86_64 | 2 + configs/baseline/pacman.conf | 2 + configs/baseline/syslinux/syslinux.cfg | 3 + configs/releng/airootfs/etc/fstab | 2 + configs/releng/airootfs/etc/hostname | 2 + configs/releng/airootfs/etc/locale.conf | 3 + .../systemd/journald.conf.d/volatile-storage.conf | 3 + .../etc/systemd/logind.conf.d/do-not-suspend.conf | 3 + .../etc/systemd/network/20-ethernet.network | 3 + .../etc/systemd/network/20-wireless.network | 3 + .../etc/systemd/system/choose-mirror.service | 3 + .../etc/systemd/system/etc-pacman.d-gnupg.mount | 3 + .../system/getty@tty1.service.d/autologin.conf | 3 + .../etc/systemd/system/pacman-init.service | 3 + .../airootfs/etc/systemd/system/reflector.service | 3 + .../wait-for-only-one-interface.conf | 3 + configs/releng/airootfs/root/customize_airootfs.sh | 2 + .../airootfs/usr/local/bin/Installation_guide | 2 + .../releng/airootfs/usr/local/bin/choose-mirror | 2 + configs/releng/build.sh | 2 + .../efiboot/loader/entries/archiso-x86_64-cd.conf | 3 + .../efiboot/loader/entries/archiso-x86_64-usb.conf | 3 + configs/releng/efiboot/loader/loader.conf | 3 + configs/releng/isolinux/isolinux.cfg | 3 + configs/releng/mkinitcpio.conf | 3 + configs/releng/packages.x86_64 | 2 + configs/releng/pacman.conf | 2 + configs/releng/syslinux/archiso.cfg | 3 + configs/releng/syslinux/archiso_head.cfg | 3 + configs/releng/syslinux/archiso_pxe.cfg | 3 + configs/releng/syslinux/archiso_sys.cfg | 3 + configs/releng/syslinux/archiso_tail.cfg | 3 + 59 files changed, 1000 insertions(+), 6 deletions(-) create mode 100644 AUTHORS.rst create mode 100644 CONTRIBUTING.rst create mode 100644 LICENSE create mode 100644 README.rst (limited to 'configs/releng/efiboot') diff --git a/.editorconfig b/.editorconfig index 4a540f3..74ed4eb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,7 @@ -# EditorConfig configuration for archiso -# http://EditorConfig.org +# EditorConfig for archiso +# https://editorconfig.org/ +# +# SPDX-License-Identifier: GPL-3.0-or-later # Top-most EditorConfig file root = true @@ -22,3 +24,11 @@ trim_trailing_whitespace = true charset = utf-8 indent_style = space indent_size = 2 + +[*.rst] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 +indent_style = space +indent_size = 2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e69ab5e..d85b887 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ --- +# +# SPDX-License-Identifier: GPL-3.0-or-later default: image: archlinux/base diff --git a/AUTHORS.rst b/AUTHORS.rst new file mode 100644 index 0000000..4fe0eb5 --- /dev/null +++ b/AUTHORS.rst @@ -0,0 +1,33 @@ +=============== +Archiso Authors +=============== + +* Aaron Griffin +* Adam Purkrt +* Chandan Singh +* Charles Vejnar +* Christian Hesse +* Christopher Brannon +* Dan McGee +* David Runge +* David Thurstenson +* Dieter Plaetinck +* Eli Schwartz +* Florian Pritz +* Gerardo Exequiel Pozzi +* Gerhard Brauer +* James Sitegen +* Justin Kromlinger +* Keshav Amburay +* Loui Chang +* Lukas Fleischer +* Martin Damian Fernandez +* Pierre Schmitz +* Sean Enck +* Simo Leone +* Steffen Bönigk +* Sven-Hendrik Haase +* Thomas Bächler +* Yu Li-Yu +* nl6720 +* Øyvind Heggstad diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..5073aa0 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,26 @@ +============ +Contributing +============ + +These are the contribution guidelines for archiso. +All contributions fall under the terms of the GPL-3.0-or-later (see `LICENSE `_). + +Editorconfig +============ + +A top-level editorconfig file is provided. Please configure your text editor to use it. + +Linting +======= + +All ash and bash scripts are linted using shellcheck: + + .. code:: bash + + make check + +Testing +======= + +Contributors are expected to test their contributions by building the releng profile and running the resulting image +using `run_archiso `_. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/Makefile b/Makefile index 3ee8a6a..a274282 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) SCRIPT_FILES=$(wildcard archiso/initcpio/script/*) @@ -6,7 +9,7 @@ INSTALL_DIR=$(DESTDIR)/usr/lib/initcpio/install HOOKS_DIR=$(DESTDIR)/usr/lib/initcpio/hooks SCRIPT_DIR=$(DESTDIR)/usr/lib/initcpio -DOC_FILES=$(wildcard docs/*) +DOC_FILES=$(wildcard docs/*) $(wildcard *.rst) DOC_DIR=$(DESTDIR)/usr/share/doc/archiso @@ -25,7 +28,8 @@ check: install: install-program install-initcpio install-examples install-doc install-program: - install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/bin/mkarchiso + install -vDm 755 archiso/mkarchiso -t "$(DESTDIR)/usr/bin/" + install -vDm 755 scripts/run_archiso.sh "$(DESTDIR)/usr/bin/run_archiso" install-initcpio: install -d $(SCRIPT_DIR) $(HOOKS_DIR) $(INSTALL_DIR) @@ -38,7 +42,6 @@ install-examples: cp -a --no-preserve=ownership configs $(DESTDIR)/usr/share/archiso/ install-doc: - install -d $(DOC_DIR) - install -m 644 -t $(DOC_DIR) $(DOC_FILES) + install -vDm 644 $(DOC_FILES) -t $(DOC_DIR) .PHONY: check install install-program install-initcpio install-examples install-doc diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..7ad0d41 --- /dev/null +++ b/README.rst @@ -0,0 +1,118 @@ +======= +archiso +======= + +The archiso project features scripts and configuration templates to build installation media (*.iso* images) for BIOS +and UEFI based systems on the x86_64 architecture. +Currently creating the images is only supported on Arch Linux. + +Requirements +============ + +The following packages need to be installed to be able to create an image with the included scripts: + +* arch-install-scripts +* dosfstools +* e2fsprogs +* edk2-shell +* libisoburn +* squashfs-tools + +For running the images in a virtualized test environment the following packages are required: + +* edk2-ovmf +* qemu + +For linting the shell scripts the following package is required: + +* shellcheck + +Profiles +======== + +Archiso comes with two profiles: **baseline** and **releng**. While both can serve as starting points for creating +custom live media, **releng** is used to create the monthly installation medium. +They can be found below `configs/baseline/ `_ and `configs/releng/ `_ +(respectively). Both profiles are defined by files to be placed into overlays (e.g. *airootfs* -> *the image's /*) and +dynamic actions (i.e. *build.sh* scripts). + +Create images +============= + +Usually the archiso tools are installed as a package. However, it is also possible to clone this repository and create +images without installing archiso system-wide. + +As filesystems are created and various mount actions have to be done when creating an image, **root** is required to run +the scripts. + +When archiso is installed system-wide and the modification of a profile is desired, it is necessary to copy it to a +writeable location, as */usr/share/archiso* is tracked by the package manager and only writeable by root (changes will +be lost on update). + +The examples below will assume an unmodified profile in a system location (unless noted otherwise). + +It is advised to check the help information of the **build.sh** scripts in the profiles: + + .. code:: bash + + /usr/share/archiso/configs/releng/build.sh --help + +Create images with packaged archiso +----------------------------------- + + .. code:: bash + + /usr/share/archiso/configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir + +Create images with local clone +------------------------------ + +Clone this repository and make sure to run with the local `mkarchiso `_ script in *PATH* (if it has +been modified): + + .. code:: bash + + PATH="archiso:$PATH" ./configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir + +Testing +======= + +The convenience script **run_archiso** is provided to boot into the medium using qemu. +It is advised to read its help information: + + .. code:: bash + + run_archiso -h + +Run the following to boot the iso using BIOS: + + .. code:: bash + + run_archiso -i path/to/an/arch.iso + +Run the following to boot the iso using UEFI: + + .. code:: bash + + run_archiso -i path/to/an/arch.iso -u + +The script can of course also be executed from this repository: + + + .. code:: bash + + ./scripts/run_archiso.sh -i path/to/an/arch.iso + +Installation +============ + +To install archiso system-wide use the included **Makefile**: + + .. code:: bash + + make install + +License +======= + +Archiso is licensed under the terms of the **GPL-3.0-or-later** (see `LICENSE `_). diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 7f2f9a7..a12c260 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later # args: source, newroot, mountpoint _mnt_dmsnapshot() { diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt index 2c607f5..41899e4 100644 --- a/archiso/initcpio/hooks/archiso_loop_mnt +++ b/archiso/initcpio/hooks/archiso_loop_mnt @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook () { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common index bf8e883..f02ef12 100644 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ b/archiso/initcpio/hooks/archiso_pxe_common @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook () { # Do *not* declare 'bootif_dev' local! We need it in run_latehook(). diff --git a/archiso/initcpio/hooks/archiso_pxe_http b/archiso/initcpio/hooks/archiso_pxe_http index bf2f5f4..efae923 100644 --- a/archiso/initcpio/hooks/archiso_pxe_http +++ b/archiso/initcpio/hooks/archiso_pxe_http @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook() { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_pxe_nbd b/archiso/initcpio/hooks/archiso_pxe_nbd index 4ccbcbf..8ac44e7 100644 --- a/archiso/initcpio/hooks/archiso_pxe_nbd +++ b/archiso/initcpio/hooks/archiso_pxe_nbd @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_earlyhook() { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_pxe_nfs b/archiso/initcpio/hooks/archiso_pxe_nfs index be1e4c3..9d3964b 100644 --- a/archiso/initcpio/hooks/archiso_pxe_nfs +++ b/archiso/initcpio/hooks/archiso_pxe_nfs @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook() { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_shutdown b/archiso/initcpio/hooks/archiso_shutdown index db8fb33..ebb6b11 100644 --- a/archiso/initcpio/hooks/archiso_shutdown +++ b/archiso/initcpio/hooks/archiso_shutdown @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_cleanuphook() { rm -rf /usr/lib/modules diff --git a/archiso/initcpio/install/archiso b/archiso/initcpio/install/archiso index a12104e..3006b5f 100644 --- a/archiso/initcpio/install/archiso +++ b/archiso/initcpio/install/archiso @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "cdrom" diff --git a/archiso/initcpio/install/archiso_kms b/archiso/initcpio/install/archiso_kms index 48832ff..8129127 100644 --- a/archiso/initcpio/install/archiso_kms +++ b/archiso/initcpio/install/archiso_kms @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "amdgpu" diff --git a/archiso/initcpio/install/archiso_loop_mnt b/archiso/initcpio/install/archiso_loop_mnt index 4a5824d..1f2c529 100644 --- a/archiso/initcpio/install/archiso_loop_mnt +++ b/archiso/initcpio/install/archiso_loop_mnt @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_runscript diff --git a/archiso/initcpio/install/archiso_pxe_common b/archiso/initcpio/install/archiso_pxe_common index da5f6b6..458fa69 100644 --- a/archiso/initcpio/install/archiso_pxe_common +++ b/archiso/initcpio/install/archiso_pxe_common @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/" diff --git a/archiso/initcpio/install/archiso_pxe_http b/archiso/initcpio/install/archiso_pxe_http index 3353eb7..1e80852 100644 --- a/archiso/initcpio/install/archiso_pxe_http +++ b/archiso/initcpio/install/archiso_pxe_http @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_runscript diff --git a/archiso/initcpio/install/archiso_pxe_nbd b/archiso/initcpio/install/archiso_pxe_nbd index 9fe3fdd..b4fb3b6 100644 --- a/archiso/initcpio/install/archiso_pxe_nbd +++ b/archiso/initcpio/install/archiso_pxe_nbd @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "nbd" diff --git a/archiso/initcpio/install/archiso_pxe_nfs b/archiso/initcpio/install/archiso_pxe_nfs index fa4e548..efd609d 100644 --- a/archiso/initcpio/install/archiso_pxe_nfs +++ b/archiso/initcpio/install/archiso_pxe_nfs @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "nfs" diff --git a/archiso/initcpio/install/archiso_shutdown b/archiso/initcpio/install/archiso_shutdown index 1051d1b..b2c6bd4 100644 --- a/archiso/initcpio/install/archiso_shutdown +++ b/archiso/initcpio/install/archiso_shutdown @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_binary cp diff --git a/archiso/initcpio/script/archiso_shutdown b/archiso/initcpio/script/archiso_shutdown index 4a0c7dc..23a8a79 100644 --- a/archiso/initcpio/script/archiso_shutdown +++ b/archiso/initcpio/script/archiso_shutdown @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later # /oldroot depends on things inside /oldroot/run/archiso... mkdir /oldrun diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 5e229a4..ad5232a 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -1,4 +1,6 @@ #!/bin/bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 0649d4b..92d1249 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/baseline/isolinux/isolinux.cfg b/configs/baseline/isolinux/isolinux.cfg index 33e8b65..e078ce3 100644 --- a/configs/baseline/isolinux/isolinux.cfg +++ b/configs/baseline/isolinux/isolinux.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + PATH /%INSTALL_DIR%/boot/syslinux/ DEFAULT loadconfig diff --git a/configs/baseline/mkinitcpio.conf b/configs/baseline/mkinitcpio.conf index 279eccb..2f9a39a 100644 --- a/configs/baseline/mkinitcpio.conf +++ b/configs/baseline/mkinitcpio.conf @@ -1 +1,4 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + HOOKS=(base udev archiso block filesystems) diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index d3ad7bf..14fe5f0 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -1,3 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later base linux mkinitcpio diff --git a/configs/baseline/pacman.conf b/configs/baseline/pacman.conf index bbca42f..9d895e9 100644 --- a/configs/baseline/pacman.conf +++ b/configs/baseline/pacman.conf @@ -2,6 +2,8 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index e31bb8c..a3908da 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + UI boot/syslinux/menu.c32 MENU TITLE Arch Linux MENU CLEAR diff --git a/configs/releng/airootfs/etc/fstab b/configs/releng/airootfs/etc/fstab index e69de29..3988279 100644 --- a/configs/releng/airootfs/etc/fstab +++ b/configs/releng/airootfs/etc/fstab @@ -0,0 +1,2 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/configs/releng/airootfs/etc/hostname b/configs/releng/airootfs/etc/hostname index 2dbe21e..a5f866b 100644 --- a/configs/releng/airootfs/etc/hostname +++ b/configs/releng/airootfs/etc/hostname @@ -1 +1,3 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later archiso diff --git a/configs/releng/airootfs/etc/locale.conf b/configs/releng/airootfs/etc/locale.conf index 01ec548..9bf7aef 100644 --- a/configs/releng/airootfs/etc/locale.conf +++ b/configs/releng/airootfs/etc/locale.conf @@ -1 +1,4 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + LANG=en_US.UTF-8 diff --git a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf index b69850d..3104779 100644 --- a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf +++ b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Journal] Storage=volatile diff --git a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf index f3ecb39..c6b17a4 100644 --- a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf +++ b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Login] HandleSuspendKey=ignore HandleHibernateKey=ignore diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 37878b0..efa309c 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Match] Name=en* Name=eth* diff --git a/configs/releng/airootfs/etc/systemd/network/20-wireless.network b/configs/releng/airootfs/etc/systemd/network/20-wireless.network index e1d624c..bf9ab9d 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wireless.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wireless.network @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Match] Name=wlp* Name=wlan* diff --git a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service index b6a3562..b3e4847 100644 --- a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service +++ b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Choose mirror from the kernel command line ConditionKernelCommandLine=mirror diff --git a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount index 4eab551..f86a91d 100644 --- a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount +++ b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Temporary /etc/pacman.d/gnupg directory diff --git a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index d1d8474..370735f 100644 --- a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Service] ExecStart= ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index 23b8144..3adec4c 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Initializes Pacman keyring Wants=haveged.service diff --git a/configs/releng/airootfs/etc/systemd/system/reflector.service b/configs/releng/airootfs/etc/systemd/system/reflector.service index f7a88f2..e15dccf 100644 --- a/configs/releng/airootfs/etc/systemd/system/reflector.service +++ b/configs/releng/airootfs/etc/systemd/system/reflector.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=pacman mirrorlist update Wants=network-online.target diff --git a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf index c875311..1b4c091 100644 --- a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Service] ExecStart= ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index 3f81617..b121e71 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/releng/airootfs/usr/local/bin/Installation_guide b/configs/releng/airootfs/usr/local/bin/Installation_guide index cd38645..d790c3e 100755 --- a/configs/releng/airootfs/usr/local/bin/Installation_guide +++ b/configs/releng/airootfs/usr/local/bin/Installation_guide @@ -1,3 +1,5 @@ #!/bin/sh +# +# SPDX-License-Identifier: GPL-3.0-or-later exec lynx 'https://wiki.archlinux.org/index.php/Installation_guide' diff --git a/configs/releng/airootfs/usr/local/bin/choose-mirror b/configs/releng/airootfs/usr/local/bin/choose-mirror index 0ae0806..b021945 100755 --- a/configs/releng/airootfs/usr/local/bin/choose-mirror +++ b/configs/releng/airootfs/usr/local/bin/choose-mirror @@ -1,4 +1,6 @@ #!/bin/bash +# +# SPDX-License-Identifier: GPL-3.0-or-later get_cmdline() { local param diff --git a/configs/releng/build.sh b/configs/releng/build.sh index fd28487..e360f23 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf index b660f1d..52d9536 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + title Arch Linux install medium (x86_64, UEFI) linux /EFI/archiso/vmlinuz-linux initrd /EFI/archiso/intel-ucode.img diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf index 78c7d23..e1a3908 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + title Arch Linux install medium (x86_64, UEFI) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 9a0049c..fd7db27 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + timeout 3 default archiso-x86_64.conf diff --git a/configs/releng/isolinux/isolinux.cfg b/configs/releng/isolinux/isolinux.cfg index 10fd285..7b14d59 100644 --- a/configs/releng/isolinux/isolinux.cfg +++ b/configs/releng/isolinux/isolinux.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + PATH /%INSTALL_DIR%/boot/syslinux/ DEFAULT loadconfig diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index c04f1dc..1b35687 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) COMPRESSION="xz" diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 1cfd724..2c73b8e 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,3 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later amd-ucode arch-install-scripts b43-fwcutter diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index bbca42f..9d895e9 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -2,6 +2,8 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg index 40d8b34..a6ba8b0 100644 --- a/configs/releng/syslinux/archiso.cfg +++ b/configs/releng/syslinux/archiso.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + DEFAULT select LABEL select diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index a915d34..2dc18ed 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + SERIAL 0 38400 UI boot/syslinux/vesamenu.c32 MENU TITLE Arch Linux diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index 45a8a17..a9c0062 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/archiso_head.cfg LABEL arch64_nbd diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index fbf3772..f14d176 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/archiso_head.cfg DEFAULT arch64 diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg index 34b6c5b..685e1c8 100644 --- a/configs/releng/syslinux/archiso_tail.cfg +++ b/configs/releng/syslinux/archiso_tail.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + LABEL existing TEXT HELP Boot an existing operating system. -- cgit v1.2.3-70-g09d2 From 136152e672d56fd624a56a32af6f584f66fc50dc Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 2 Sep 2020 23:38:13 +0300 Subject: Do not rename the initramfs image This is a breaking change. archweb, archiso-manager and various documentation must be updated. * https://github.com/archlinux/archweb/blob/master/templates/releng/archlinux.ipxe * https://github.com/pierres/archiso-manager/blob/master/Makefile --- archiso/mkarchiso | 4 ++-- configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset | 2 +- configs/baseline/syslinux/syslinux.cfg | 2 +- configs/releng/airootfs/etc/mkinitcpio.d/linux.preset | 2 +- configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf | 2 +- configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf | 2 +- configs/releng/syslinux/archiso_pxe.cfg | 6 +++--- configs/releng/syslinux/archiso_sys.cfg | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'configs/releng/efiboot') diff --git a/archiso/mkarchiso b/archiso/mkarchiso index c5169f7..5c124bd 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -415,7 +415,7 @@ _make_bootmodes() { _make_boot_on_iso() { _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..." install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}" - install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/" + install -m 0644 -- "${airootfs_dir}/boot/initramfs-linux.img" "${isofs_dir}/${install_dir}/boot/${arch}/" install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/" if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/" @@ -516,7 +516,7 @@ _make_boot_on_fat() { _msg_info "Preparing kernel and intramfs for the FAT file system..." mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI/archiso mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \ - "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/archiso.img" ::/EFI/archiso/ + "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/initramfs-linux.img" ::/EFI/archiso/ if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" ::/EFI/archiso/ fi diff --git a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset index a1949cd..d35f137 100644 --- a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset +++ b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset @@ -8,4 +8,4 @@ PRESETS=('archiso') ALL_kver='/boot/vmlinuz-linux' ALL_config='/etc/mkinitcpio.conf' -archiso_image="/boot/archiso.img" +archiso_image="/boot/initramfs-linux.img" diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index a3908da..d7396b8 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -11,5 +11,5 @@ TIMEOUT 30 LABEL arch MENU LABEL Arch Linux LINUX boot/%ARCH%/vmlinuz-linux -INITRD boot/%ARCH%/archiso.img +INITRD boot/%ARCH%/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset index a1949cd..d35f137 100644 --- a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset +++ b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset @@ -8,4 +8,4 @@ PRESETS=('archiso') ALL_kver='/boot/vmlinuz-linux' ALL_config='/etc/mkinitcpio.conf' -archiso_image="/boot/archiso.img" +archiso_image="/boot/initramfs-linux.img" diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf index 52d9536..a706064 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -5,5 +5,5 @@ title Arch Linux install medium (x86_64, UEFI) linux /EFI/archiso/vmlinuz-linux initrd /EFI/archiso/intel-ucode.img initrd /EFI/archiso/amd-ucode.img -initrd /EFI/archiso/archiso.img +initrd /EFI/archiso/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf index e1a3908..1a14b11 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -5,5 +5,5 @@ title Arch Linux install medium (x86_64, UEFI) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/archiso.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index ed15c7d..e51b55a 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -10,7 +10,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NBD) LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -21,7 +21,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NFS) LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify SYSAPPEND 3 @@ -32,7 +32,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, HTTP) LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index f14d176..6e8d9e3 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -13,7 +13,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, BIOS) LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% INCLUDE boot/syslinux/archiso_tail.cfg -- cgit v1.2.3-70-g09d2 From 83e4cb9fb9934611e0508ac4e6ee97a1a0bd2ffc Mon Sep 17 00:00:00 2001 From: nl6720 Date: Thu, 3 Sep 2020 00:03:38 +0300 Subject: Use the same file paths in both ISO 9660 and FAT This allows to use only one systemd-boot configuration file per kernel. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/44 . --- archiso/mkarchiso | 19 ++++++++++--------- .../efiboot/loader/entries/archiso-x86_64-cd.conf | 9 --------- .../efiboot/loader/entries/archiso-x86_64-linux.conf | 9 +++++++++ .../efiboot/loader/entries/archiso-x86_64-usb.conf | 9 --------- configs/releng/efiboot/loader/loader.conf | 2 +- 5 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf (limited to 'configs/releng/efiboot') diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 5c124bd..d83ab2f 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -500,8 +500,8 @@ _make_efi() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g; s|%ARCH%|${arch}|g" \ - "${profile}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \ - "${isofs_dir}/loader/entries/archiso-x86_64.conf" + "${profile}/efiboot/loader/entries/archiso-x86_64-linux.conf" > \ + "${isofs_dir}/loader/entries/archiso-x86_64-linux.conf" # edk2-shell based UEFI shell # shellx64.efi is picked up automatically when on / @@ -514,14 +514,15 @@ _make_efi() { # Prepare kernel/initramfs on efiboot.img _make_boot_on_fat() { _msg_info "Preparing kernel and intramfs for the FAT file system..." - mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI/archiso - mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \ - "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/initramfs-linux.img" ::/EFI/archiso/ + mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" \ + "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}" + mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/vmlinuz-linux" \ + "${airootfs_dir}/boot/initramfs-linux.img" "::/${install_dir}/boot/${arch}/" if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then - mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" ::/EFI/archiso/ + mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" "::/${install_dir}/boot/" fi if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then - mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/amd-ucode.img" ::/EFI/archiso/ + mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/amd-ucode.img" "::/${install_dir}/boot/" fi _msg_info "Done!" } @@ -544,8 +545,8 @@ _make_boot_uefi-x64.systemd-boot.esp() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g; s|%ARCH%|${arch}|g" \ - "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" \ - | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - ::/loader/entries/archiso-x86_64.conf + "${profile}/efiboot/loader/entries/archiso-x86_64-linux.conf" \ + | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - ::/loader/entries/archiso-x86_64-linux.conf # shellx64.efi is picked up automatically when on / if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf deleted file mode 100644 index a706064..0000000 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Arch Linux install medium (x86_64, UEFI) -linux /EFI/archiso/vmlinuz-linux -initrd /EFI/archiso/intel-ucode.img -initrd /EFI/archiso/amd-ucode.img -initrd /EFI/archiso/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf new file mode 100644 index 0000000..1a14b11 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux install medium (x86_64, UEFI) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf deleted file mode 100644 index 1a14b11..0000000 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Arch Linux install medium (x86_64, UEFI) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index fd7db27..1ea5ce5 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 3 -default archiso-x86_64.conf +default archiso-x86_64-linux.conf -- cgit v1.2.3-70-g09d2 From 6a39300b0f0a08574038bad4537a27bb614a841d Mon Sep 17 00:00:00 2001 From: Alexander Epaneshnikov Date: Sat, 3 Oct 2020 22:32:05 +0300 Subject: implement accessibility support in archiso this fixes #67 --- Makefile | 3 +- .../etc/systemd/system/livecd-alsa-unmuter.service | 16 ++ .../etc/systemd/system/livecd-talk.service | 23 ++ .../multi-user.target.wants/livecd-talk.service | 1 + .../sound.target.wants/livecd-alsa-unmuter.service | 1 + configs/releng/airootfs/root/.zlogin | 5 + configs/releng/airootfs/usr/local/bin/livecd-sound | 252 +++++++++++++++++++++ .../usr/local/share/livecd-sound/asound.conf.in | 3 + .../entries/archiso-x86_64-speech-linux.conf | 9 + configs/releng/efiboot/loader/loader.conf | 2 +- configs/releng/packages.x86_64 | 4 + configs/releng/syslinux/archiso_head.cfg | 1 + configs/releng/syslinux/archiso_sys-linux.cfg | 11 + configs/releng/syslinux/archiso_sys.cfg | 2 +- 14 files changed, 330 insertions(+), 3 deletions(-) create mode 100644 configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service create mode 100644 configs/releng/airootfs/etc/systemd/system/livecd-talk.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service create mode 120000 configs/releng/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service create mode 100755 configs/releng/airootfs/usr/local/bin/livecd-sound create mode 100644 configs/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf (limited to 'configs/releng/efiboot') diff --git a/Makefile b/Makefile index 2890026..1f94998 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,8 @@ lint: $(wildcard configs/*/build.sh) \ $(wildcard configs/*/profiledef.sh) \ configs/releng/airootfs/root/.automated_script.sh \ - configs/releng/airootfs/usr/local/bin/choose-mirror + configs/releng/airootfs/usr/local/bin/choose-mirror \ + configs/releng/airootfs/usr/local/bin/livecd-sound shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES) install: install-program install-examples install-doc diff --git a/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service b/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service new file mode 100644 index 0000000..8c5317d --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service @@ -0,0 +1,16 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +[Unit] +Description=Unmute All Sound Card Controls For Use With The Live Arch Environment +# This needs to run after the audio device becomes available. +Wants=systemd-udev-settle.service +After=systemd-udev-settle.service sound.target +ConditionKernelCommandLine=accessibility=on + +[Service] +Type=oneshot +ExecStart=/usr/local/bin/livecd-sound -u + +[Install] +WantedBy=sound.target diff --git a/configs/releng/airootfs/etc/systemd/system/livecd-talk.service b/configs/releng/airootfs/etc/systemd/system/livecd-talk.service new file mode 100644 index 0000000..d959ab3 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/livecd-talk.service @@ -0,0 +1,23 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +[Unit] +Description=Screen reader service +After=livecd-alsa-unmuter.service +Before=getty@tty1.service +ConditionKernelCommandLine=accessibility=on + +[Service] +Type=oneshot +TTYPath=/dev/tty13 +ExecStartPre=/usr/bin/chvt 13 +ExecStart=/usr/local/bin/livecd-sound -p +ExecStartPost=/usr/bin/chvt 1 +ExecStartPost=systemctl start espeakup.service +StandardInput=tty +TTYVHangup=yes +TTYVTDisallocate=yes +RemainAfterExit=true + +[Install] +WantedBy=multi-user.target diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service new file mode 120000 index 0000000..b917481 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service @@ -0,0 +1 @@ +/etc/systemd/system/livecd-talk.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service b/configs/releng/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service new file mode 120000 index 0000000..98c0fc8 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service @@ -0,0 +1 @@ +../livecd-alsa-unmuter.service \ No newline at end of file diff --git a/configs/releng/airootfs/root/.zlogin b/configs/releng/airootfs/root/.zlogin index f598e43..0fb119d 100644 --- a/configs/releng/airootfs/root/.zlogin +++ b/configs/releng/airootfs/root/.zlogin @@ -1 +1,6 @@ +# fix for screen readers +if grep -Fq 'accessibility=' /proc/cmdline &> /dev/null; then + setopt SINGLE_LINE_ZLE +fi + ~/.automated_script.sh diff --git a/configs/releng/airootfs/usr/local/bin/livecd-sound b/configs/releng/airootfs/usr/local/bin/livecd-sound new file mode 100755 index 0000000..87d6f30 --- /dev/null +++ b/configs/releng/airootfs/usr/local/bin/livecd-sound @@ -0,0 +1,252 @@ +#!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later + +usage() { + cat <<- _EOF_ + live cd sound helper script. + Usage: livecdsound [OPTION] + OPTIONS + -u, --unmute unmute all sound cards + -p, --pick select a card for speetch output + -h, --help Show this usage message + +_EOF_ +} + +bugout () { + printf "/usr/local/bin/livecdsound: programming error" + stat_fail +} + +echo_card_indices() +{ + if [ -f /proc/asound/cards ] ; then + sed -n -e's/^[[:space:]]*\([0-7]\)[[:space:]].*/\1/p' /proc/asound/cards + fi +} + +# The following functions try to set many controls. +# No card has all the controls and so some of the attempts are bound to fail. +# Because of this, the functions can't return useful status values. + +# $1 +# $2 +# $3 +unmute_and_set_level(){ + { [ "$3" ] &&[ "$2" ] && [ "$1" ] ; } || bugout + systemd-cat -t "livecdsound" printf "Setting: %s on card: %s to %s\n" "$2" "$1" "$3" + systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3" unmute + return 0 +} + +# $1 +# $2 +mute_and_zero_level() +{ + { [ "$1" ] && [ "$2" ] ; } || bugout + systemd-cat -t "livecdsound" printf "Muting control: %s on card: %s\n" "$2" "$1" + systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "0%" mute + return 0 +} + +# $1 +# $2 +# $3 "on" | "off" +switch_control() +{ + { [ "$3" ] && [ "$1" ] ; } || bugout + systemd-cat -t "livecdsound" printf "Switching control: %s on card: %s to %s\n" "$2" "$1" "$3" + systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3" + return 0 +} + +# $1 +sanify_levels_on_card() +{ + unmute_and_set_level "$1" "Front" "80%" + unmute_and_set_level "$1" "Master" "80%" + unmute_and_set_level "$1" "Master Mono" "80%" + unmute_and_set_level "$1" "Master Digital" "80%" # E.g., cs4237B + unmute_and_set_level "$1" "Playback" "80%" + unmute_and_set_level "$1" "Headphone" "100%" + unmute_and_set_level "$1" "PCM" "80%" + unmute_and_set_level "$1" "PCM,1" "80%" # E.g., ess1969 + unmute_and_set_level "$1" "DAC" "80%" # E.g., envy24, cs46xx + unmute_and_set_level "$1" "DAC,0" "80%" # E.g., envy24 + unmute_and_set_level "$1" "DAC,1" "80%" # E.g., envy24 + unmute_and_set_level "$1" "Synth" "80%" + unmute_and_set_level "$1" "CD" "80%" + unmute_and_set_level "$1" "PC Speaker" "100%" + + mute_and_zero_level "$1" "Mic" + mute_and_zero_level "$1" "IEC958" # Ubuntu #19648 + + # Intel P4P800-MX + switch_control "$1" "Master Playback Switch" on + switch_control "$1" "Master Surround" on + + # Trident/YMFPCI/emu10k1: + unmute_and_set_level "$1" "Wave" "80%" + unmute_and_set_level "$1" "Music" "80%" + unmute_and_set_level "$1" "AC97" "80%" + + # DRC: + unmute_and_set_level "$1" "Dynamic Range Compression" "80%" + + # Required for HDA Intel (hda-intel): + unmute_and_set_level "$1" "Front" "80%" + + # Required for SB Live 7.1/24-bit (ca0106): + unmute_and_set_level "$1" "Analog Front" "80%" + + # Required at least for Via 823x hardware on DFI K8M800-MLVF Motherboard + switch_control "$1" "IEC958 Capture Monitor" off + + # Required for hardware allowing toggles for AC97 through IEC958, + # valid values are 0, 1, 2, 3. Needs to be set to 0 for PCM1. + unmute_and_set_level "$1" "IEC958 Playback AC97-SPSA" "0" + + # Required for newer Via hardware + unmute_and_set_level "$1" "VIA DXS,0" "80%" + unmute_and_set_level "$1" "VIA DXS,1" "80%" + unmute_and_set_level "$1" "VIA DXS,2" "80%" + unmute_and_set_level "$1" "VIA DXS,3" "80%" + + # Required on some notebooks with ICH4: + switch_control "$1" "Headphone Jack Sense" off + switch_control "$1" "Line Jack Sense" off + + # Some machines need one or more of these to be on; + # others need one or more of these to be off: + + switch_control "$1" "Audigy Analog/Digital Output Jack" on + switch_control "$1" "SB Live Analog/Digital Output Jack" on + + # D1984 -- Thinkpad T61/X61 + switch_control "$1" "Speaker" on + switch_control "$1" "Headphone" on + + # HDA-Intel w/ "Digital" capture mixer (See Ubuntu #193823) + unmute_and_set_level "$1" "Digital" "80%" + + return 0 +} + +# $1 | "all" +sanify_levels() +{ + local ttsdml_returnstatus=0 + local card + case "$1" in + all) + for card in $(echo_card_indices) ; do + sanify_levels_on_card "$card" || ttsdml_returnstatus=1 + done + ;; + *) + sanify_levels_on_card "$1" || ttsdml_returnstatus=1 + ;; + esac + return $ttsdml_returnstatus +} + +# List all cards that *should* be usable for PCM audio. In my experience, +# the console speaker (handled by the pcsp driver) isn't a suitable playback +# device, so we'll exclude it. +list_non_pcsp_cards() +{ + for card in $(echo_card_indices); do + local cardfile="/proc/asound/card${card}/id" + if [ -r "$cardfile" ] && [ -f "$cardfile" ] && \ + [ "$(cat "$cardfile")" != pcsp ]; then + echo "$card" + fi + done +} + +# Properly initialize the sound card so that we have audio at boot. +unmute_all_cards() +{ + sanify_levels all +} + +nwords() { + echo $# +} + +is_numeric() { + local str=$1 + expr match "$str" '[[:digit:]]\+$' > /dev/null 2>&1 +} + +set_default_card() { + local card=$1 + sed -e "s/%card%/$card/g" < /usr/local/share/livecd-sound/asound.conf.in \ + > /etc/asound.conf +} + +play_on_card() { + local card=$1 file=$2 + aplay -q "-Dplughw:$card,0" "$file" +} + +# If there are multiple usable sound cards, prompt the user to choose one, +# using auditory feedback. +pick_a_card() +{ + set -f + usable_cards="$(list_non_pcsp_cards)" + num_usable_cards=$(nwords $usable_cards) + + if [ "$num_usable_cards" -eq 1 ]; then + systemd-cat -t "livecdsound" printf "Only one sound card is detected\n" + exit 0 + fi + systemd-cat -t "livecdsound" printf "multiple sound cards detected\n" + for card in $usable_cards; do + if ! is_numeric "$card"; then + continue + fi + play_on_card "$card" /usr/share/livecd-sounds/pick-a-card.wav& + done + wait + sleep 1 + for card in $usable_cards; do + if ! is_numeric "$card"; then + continue + fi + play_on_card "$card" /usr/share/livecd-sounds/beep.wav + if read -r -t 10; then + systemd-cat -t "livecdsound" printf "Selecting %s sound card as default\n" "$card" + set_default_card "$card" + break + fi +done +} + +if [[ $# -eq 0 ]]; then + echo "error: No argument passed." + exit 1 +fi +while [[ "${1}" != "" ]]; do + case ${1} in + -h|--help) + usage + exit + ;; + -u|--unmute) + systemd-cat -t "livecdsound" printf "Unmuting all cards" + unmute_all_cards + ;; + -p|--pick) + pick_a_card + ;; + *) + echo "error: Unsupported argument" + usage + exit 1 + ;; + esac + shift +done diff --git a/configs/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in b/configs/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in new file mode 100644 index 0000000..3f9c7aa --- /dev/null +++ b/configs/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in @@ -0,0 +1,3 @@ +Defaults node +defaults.ctl.card %card%; +defaults.pcm.card %card%; diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf new file mode 100644 index 0000000..a9525ee --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux install medium (x86_64, UEFI) with speach +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 1ea5ce5..e4ef640 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,5 +1,5 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -timeout 3 +timeout 30 default archiso-x86_64-linux.conf diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index c481c45..2160eb6 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,10 +1,12 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +alsa-utils amd-ucode arch-install-scripts b43-fwcutter base bind-tools +brltty broadcom-wl btrfs-progs clonezilla @@ -19,6 +21,7 @@ dnsmasq dosfstools edk2-shell efibootmgr +espeakup ethtool exfatprogs f2fs-tools @@ -40,6 +43,7 @@ lftp linux linux-atm linux-firmware +livecd-sounds lsscsi lvm2 lynx diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index 2dc18ed..be08525 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -28,3 +28,4 @@ MENU COLOR msg07 37;40 #90ffffff #a0000000 std MENU COLOR tabmsg 31;40 #30ffffff #00000000 std MENU CLEAR +MENU IMMEDIATE diff --git a/configs/releng/syslinux/archiso_sys-linux.cfg b/configs/releng/syslinux/archiso_sys-linux.cfg index 6d0186b..d5fd776 100644 --- a/configs/releng/syslinux/archiso_sys-linux.cfg +++ b/configs/releng/syslinux/archiso_sys-linux.cfg @@ -10,3 +10,14 @@ MENU LABEL Arch Linux install medium (x86_64, BIOS) LINUX boot/x86_64/vmlinuz-linux INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% + +# Accessibility boot option +LABEL arch64speech +TEXT HELP +Boot the Arch Linux install medium on BIOS with speakup screen reader. +It allows you to install Arch Linux or perform system maintenance with speech feedback. +ENDTEXT +MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech +LINUX boot/x86_64/vmlinuz-linux +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index 8a61d49..ac06ef6 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -4,7 +4,7 @@ INCLUDE boot/syslinux/archiso_head.cfg DEFAULT arch64 -TIMEOUT 30 +TIMEOUT 300 INCLUDE boot/syslinux/archiso_sys-linux.cfg -- cgit v1.2.3-70-g09d2 From e369ade17d219cff62016de4fcd81d7f9a77d640 Mon Sep 17 00:00:00 2001 From: Alexander Epaneshnikov Date: Thu, 29 Oct 2020 19:16:14 +0300 Subject: fix a typo, add myself in AUTHORS.rst --- AUTHORS.rst | 1 + configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'configs/releng/efiboot') diff --git a/AUTHORS.rst b/AUTHORS.rst index 4fe0eb5..536c15c 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -4,6 +4,7 @@ Archiso Authors * Aaron Griffin * Adam Purkrt +* Alexander Epaneshnikov * Chandan Singh * Charles Vejnar * Christian Hesse diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf index a9525ee..632c446 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -title Arch Linux install medium (x86_64, UEFI) with speach +title Arch Linux install medium (x86_64, UEFI) with speech linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img -- cgit v1.2.3-70-g09d2 From ee6c5faa8634920502de670435c428914c2ba6f3 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 31 Oct 2020 13:30:00 +0100 Subject: Set bootloader timeouts to 15s configs/releng/efiboot/loader/loader.conf, configs/releng/syslinux/archiso_sys.cfg: Set the bootloader timeout to 15s, as they have been set to an overly generous 30s in !79. Fixes #80 --- configs/releng/efiboot/loader/loader.conf | 2 +- configs/releng/syslinux/archiso_sys.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/releng/efiboot') diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index e4ef640..767d225 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,5 +1,5 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -timeout 30 +timeout 15 default archiso-x86_64-linux.conf diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index ac06ef6..8f45bc5 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -4,7 +4,7 @@ INCLUDE boot/syslinux/archiso_head.cfg DEFAULT arch64 -TIMEOUT 300 +TIMEOUT 15 INCLUDE boot/syslinux/archiso_sys-linux.cfg -- cgit v1.2.3-70-g09d2 From 31427eca7a3a6eea80fa2e3910e5805bee14c0c4 Mon Sep 17 00:00:00 2001 From: Simon Wilper Date: Tue, 6 Apr 2021 22:21:11 +0200 Subject: Apply copytoram Boot Option Menu Entries also to releng --- .../efiboot/loader/entries/02-archiso-x86_64-linux-ram.conf | 7 ------- .../efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf | 7 +++++++ .../efiboot/loader/entries/01-archiso-x86_64-linux.conf | 9 +++++++++ .../loader/entries/02-archiso-x86_64-speech-linux.conf | 9 +++++++++ .../efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf | 9 +++++++++ .../releng/efiboot/loader/entries/archiso-x86_64-linux.conf | 9 --------- .../efiboot/loader/entries/archiso-x86_64-speech-linux.conf | 9 --------- configs/releng/efiboot/loader/loader.conf | 2 +- configs/releng/syslinux/archiso_sys-linux.cfg | 11 +++++++++++ 9 files changed, 46 insertions(+), 26 deletions(-) delete mode 100644 configs/baseline/efiboot/loader/entries/02-archiso-x86_64-linux-ram.conf create mode 100644 configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf create mode 100644 configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf create mode 100644 configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf create mode 100644 configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf (limited to 'configs/releng/efiboot') diff --git a/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-linux-ram.conf b/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-linux-ram.conf deleted file mode 100644 index c5e9ab9..0000000 --- a/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-linux-ram.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Arch Linux (x86_64, UEFI) Copy to RAM -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram diff --git a/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf b/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf new file mode 100644 index 0000000..c5e9ab9 --- /dev/null +++ b/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux (x86_64, UEFI) Copy to RAM +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram diff --git a/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf new file mode 100644 index 0000000..1a14b11 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux install medium (x86_64, UEFI) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf new file mode 100644 index 0000000..632c446 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux install medium (x86_64, UEFI) with speech +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on diff --git a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf new file mode 100644 index 0000000..9eba5a9 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux install medium (x86_64, UEFI, Copy to RAM) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf deleted file mode 100644 index 1a14b11..0000000 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Arch Linux install medium (x86_64, UEFI) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf deleted file mode 100644 index 632c446..0000000 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-linux.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Arch Linux install medium (x86_64, UEFI) with speech -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 767d225..4f6252f 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 15 -default archiso-x86_64-linux.conf +default 01-archiso-x86_64-linux.conf diff --git a/configs/releng/syslinux/archiso_sys-linux.cfg b/configs/releng/syslinux/archiso_sys-linux.cfg index e2b4edd..e1894c1 100644 --- a/configs/releng/syslinux/archiso_sys-linux.cfg +++ b/configs/releng/syslinux/archiso_sys-linux.cfg @@ -21,3 +21,14 @@ MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on + +# Copy to RAM boot option +LABEL arch64ram +TEXT HELP +Boot the Arch Linux install medium on BIOS with Copy-to-RAM option +It allows you to install Arch Linux or perform system maintenance. +ENDTEXT +MENU LABEL Arch Linux install medium (x86_64, BIOS, Copy to RAM) +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram -- cgit v1.2.3-70-g09d2 From 00a1e8e7d2c1d42eed47144fa63243bb7d4a1406 Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 29 Jul 2021 20:42:11 +0200 Subject: Remove SPDX license identifier from releng configs configs/releng/*: Remove the SPDX license identifier comment from the configuration files in the profile, as they are not eligible for copyright. --- configs/releng/airootfs/etc/hostname | 2 -- configs/releng/airootfs/etc/locale.conf | 3 --- configs/releng/airootfs/etc/mkinitcpio.conf | 3 --- configs/releng/airootfs/etc/mkinitcpio.d/linux.preset | 3 --- .../releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf | 3 --- configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf | 3 --- configs/releng/airootfs/etc/systemd/network/20-ethernet.network | 3 --- configs/releng/airootfs/etc/systemd/network/20-wlan.network | 3 --- configs/releng/airootfs/etc/systemd/network/20-wwan.network | 3 --- configs/releng/airootfs/etc/systemd/system/choose-mirror.service | 3 --- configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount | 3 --- .../airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf | 3 --- configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service | 3 --- configs/releng/airootfs/etc/systemd/system/livecd-talk.service | 3 --- configs/releng/airootfs/etc/systemd/system/pacman-init.service | 3 --- .../wait-for-only-one-interface.conf | 3 --- configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf | 3 --- .../releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf | 3 --- configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf | 3 --- configs/releng/efiboot/loader/loader.conf | 3 --- configs/releng/packages.x86_64 | 2 -- configs/releng/pacman.conf | 2 -- configs/releng/syslinux/archiso_head.cfg | 3 --- configs/releng/syslinux/archiso_pxe-linux.cfg | 3 --- configs/releng/syslinux/archiso_pxe.cfg | 3 --- configs/releng/syslinux/archiso_sys-linux.cfg | 3 --- configs/releng/syslinux/archiso_sys.cfg | 3 --- configs/releng/syslinux/archiso_tail.cfg | 3 --- configs/releng/syslinux/syslinux.cfg | 3 --- 29 files changed, 84 deletions(-) (limited to 'configs/releng/efiboot') diff --git a/configs/releng/airootfs/etc/hostname b/configs/releng/airootfs/etc/hostname index a5f866b..2dbe21e 100644 --- a/configs/releng/airootfs/etc/hostname +++ b/configs/releng/airootfs/etc/hostname @@ -1,3 +1 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later archiso diff --git a/configs/releng/airootfs/etc/locale.conf b/configs/releng/airootfs/etc/locale.conf index 9bf7aef..01ec548 100644 --- a/configs/releng/airootfs/etc/locale.conf +++ b/configs/releng/airootfs/etc/locale.conf @@ -1,4 +1 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LANG=en_US.UTF-8 diff --git a/configs/releng/airootfs/etc/mkinitcpio.conf b/configs/releng/airootfs/etc/mkinitcpio.conf index c37b19f..2de9623 100644 --- a/configs/releng/airootfs/etc/mkinitcpio.conf +++ b/configs/releng/airootfs/etc/mkinitcpio.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # vim:set ft=sh # MODULES # The following modules are loaded before any boot hooks are diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset index d35f137..9f67184 100644 --- a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset +++ b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # mkinitcpio preset file for the 'linux' package on archiso PRESETS=('archiso') diff --git a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf index 3104779..b69850d 100644 --- a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf +++ b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf @@ -1,5 +1,2 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Journal] Storage=volatile diff --git a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf index c6b17a4..f3ecb39 100644 --- a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf +++ b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Login] HandleSuspendKey=ignore HandleHibernateKey=ignore diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 88662a4..f2a7d60 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Match] Name=en* Name=eth* diff --git a/configs/releng/airootfs/etc/systemd/network/20-wlan.network b/configs/releng/airootfs/etc/systemd/network/20-wlan.network index 6bbd7ed..601d5b8 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wlan.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wlan.network @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Match] Name=wl* diff --git a/configs/releng/airootfs/etc/systemd/network/20-wwan.network b/configs/releng/airootfs/etc/systemd/network/20-wwan.network index d57cb0f..9104c24 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wwan.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wwan.network @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Match] Name=ww* diff --git a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service index b3e4847..b6a3562 100644 --- a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service +++ b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Unit] Description=Choose mirror from the kernel command line ConditionKernelCommandLine=mirror diff --git a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount index f86a91d..4eab551 100644 --- a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount +++ b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Unit] Description=Temporary /etc/pacman.d/gnupg directory diff --git a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index 370735f..d1d8474 100644 --- a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Service] ExecStart= ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux diff --git a/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service b/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service index 8c5317d..03db4b9 100644 --- a/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service +++ b/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Unit] Description=Unmute All Sound Card Controls For Use With The Live Arch Environment # This needs to run after the audio device becomes available. diff --git a/configs/releng/airootfs/etc/systemd/system/livecd-talk.service b/configs/releng/airootfs/etc/systemd/system/livecd-talk.service index d959ab3..b38df22 100644 --- a/configs/releng/airootfs/etc/systemd/system/livecd-talk.service +++ b/configs/releng/airootfs/etc/systemd/system/livecd-talk.service @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Unit] Description=Screen reader service After=livecd-alsa-unmuter.service diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index f446a80..b18f7f8 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Unit] Description=Initializes Pacman keyring Requires=etc-pacman.d-gnupg.mount diff --git a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf index 191db81..c9f9bce 100644 --- a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # Allow systemd-networkd-wait-online to succeed with one interface, otherwise, if multiple network interfaces exist, # network-online.target gets needlessly delayed. # See https://wiki.archlinux.org/title/systemd-networkd#systemd-networkd-wait-online diff --git a/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 1a14b11..d59262f 100644 --- a/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - title Arch Linux install medium (x86_64, UEFI) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img diff --git a/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index 632c446..06f5466 100644 --- a/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - title Arch Linux install medium (x86_64, UEFI) with speech linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img diff --git a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf index 9eba5a9..9c7a51a 100644 --- a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf +++ b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - title Arch Linux install medium (x86_64, UEFI, Copy to RAM) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 4f6252f..ae63487 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,5 +1,2 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - timeout 15 default 01-archiso-x86_64-linux.conf diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index a5c5e9f..28b2311 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,5 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later alsa-utils amd-ucode arch-install-scripts diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index adb1ea8..5ee6c1e 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index 9c8e706..1154f78 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - SERIAL 0 115200 UI vesamenu.c32 MENU TITLE Arch Linux diff --git a/configs/releng/syslinux/archiso_pxe-linux.cfg b/configs/releng/syslinux/archiso_pxe-linux.cfg index 49b8c38..e8c9a7b 100644 --- a/configs/releng/syslinux/archiso_pxe-linux.cfg +++ b/configs/releng/syslinux/archiso_pxe-linux.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LABEL arch64_nbd TEXT HELP Boot the Arch Linux install medium using NBD. diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index b005cb1..b4c9a80 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - INCLUDE archiso_head.cfg INCLUDE archiso_pxe-linux.cfg diff --git a/configs/releng/syslinux/archiso_sys-linux.cfg b/configs/releng/syslinux/archiso_sys-linux.cfg index e1894c1..0d85fcc 100644 --- a/configs/releng/syslinux/archiso_sys-linux.cfg +++ b/configs/releng/syslinux/archiso_sys-linux.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LABEL arch64 TEXT HELP Boot the Arch Linux install medium on BIOS. diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index cab78f8..d93bcfe 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - INCLUDE archiso_head.cfg DEFAULT arch64 diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg index af172c0..e5339a2 100644 --- a/configs/releng/syslinux/archiso_tail.cfg +++ b/configs/releng/syslinux/archiso_tail.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LABEL existing TEXT HELP Boot an existing operating system. diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg index 847ab6b..cbda72f 100644 --- a/configs/releng/syslinux/syslinux.cfg +++ b/configs/releng/syslinux/syslinux.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - DEFAULT select LABEL select -- cgit v1.2.3-70-g09d2