From 6c487e2f77459c6dda7b4c209795a832fd049490 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Sat, 30 Jan 2021 10:06:49 +0100 Subject: [PATCH] dev moved to here --- LICENSE | 675 ++++++++++++++++++ README.md | 150 +++- airootfs/etc/passwd | 1 - airootfs/etc/shadow | 1 - airootfs/root/customize_airootfs.sh | 42 -- archiso.readme | 4 +- .../airootfs}/etc/default/grub | 0 archiso/airootfs/etc/group | 16 + {airootfs => archiso/airootfs}/etc/hostname | 0 .../airootfs}/etc/locale.conf | 0 {airootfs => archiso/airootfs}/etc/localtime | 0 .../airootfs}/etc/mkinitcpio.conf | 0 .../airootfs}/etc/mkinitcpio.d/linux.preset | 0 .../airootfs}/etc/modprobe.d/broadcom-wl.conf | 0 {airootfs => archiso/airootfs}/etc/motd | 0 archiso/airootfs/etc/pacman-more.conf | 122 ++++ archiso/airootfs/etc/pacman.conf | 102 +++ .../airootfs}/etc/pacman.d/gnupg/gpg.conf | 0 .../airootfs}/etc/pacman.d/mirrorlist | 0 archiso/airootfs/etc/passwd | 2 + .../polkit-1/rules.d/49-nopasswd_global.rules | 0 .../airootfs}/etc/resolv.conf | 0 .../airootfs}/etc/sddm.conf.d/autologin.conf | 0 archiso/airootfs/etc/shadow | 2 + .../airootfs}/etc/skel/.config/i3/config | 46 +- .../airootfs}/etc/ssh/sshd_config | 0 .../airootfs}/etc/sudoers.d/g_wheel | 0 archiso/airootfs/etc/systemd/journald.conf | 44 ++ .../journald.conf.d/volatile-storage.conf | 0 archiso/airootfs/etc/systemd/logind.conf | 38 + .../systemd/logind.conf.d/do-not-suspend.conf | 0 .../etc/systemd/network/20-ethernet.network | 0 .../etc/systemd/network/20-wireless.network | 0 .../etc/systemd/system/choose-mirror.service | 0 .../dbus-org.freedesktop.network1.service | 0 .../dbus-org.freedesktop.resolve1.service | 0 .../etc/systemd/system/default.target | 1 + .../systemd/system/display-manager.service | 1 + .../systemd/system/etc-pacman.d-gnupg.mount | 0 .../getty@tty1.service.d/autologin.conf | 0 .../system/livecd-alsa-unmuter.service | 0 .../etc/systemd/system/livecd-talk.service | 0 .../choose-mirror.service | 0 .../multi-user.target.wants/iwd.service | 0 .../livecd-talk.service | 0 .../pacman-init.service | 0 .../multi-user.target.wants/reflector.service | 0 .../systemd-networkd.service | 0 .../systemd-resolved.service | 0 .../systemd-networkd-wait-online.service | 0 .../etc/systemd/system/pacman-init.service | 1 + .../system/reflector.service.d/archiso.conf | 0 .../systemd-networkd.socket | 0 .../livecd-alsa-unmuter.service | 0 .../wait-for-only-one-interface.conf | 0 .../etc/xdg/reflector/reflector.conf | 0 .../airootfs}/root/.automated_script.sh | 0 {airootfs => archiso/airootfs}/root/.zlogin | 0 .../usr/local/bin/Installation_guide | 0 .../airootfs}/usr/local/bin/choose-mirror | 0 .../airootfs}/usr/local/bin/livecd-sound | 0 .../local/share/livecd-sound/asound.conf.in | 0 archiso/arcolinux-chaotic-pacman.conf | 129 ++++ archiso/arcolinux-pacman.conf | 122 ++++ archiso/chaotic-pacman.conf | 113 +++ .../loader/entries/archiso-x86_64-linux.conf | 0 .../entries/archiso-x86_64-speech-linux.conf | 0 .../efiboot}/loader/loader.conf | 0 archiso/example-packages.x86_64 | 204 ++++++ pacman.conf => archiso/no-extra-pacman.conf | 1 + archiso/original-packages.x86_64 | 204 ++++++ packages.x86_64 => archiso/packages.x86_64 | 39 +- archiso/pacman.conf | 129 ++++ profiledef.sh => archiso/profiledef.sh | 2 + .../syslinux}/archiso_head.cfg | 0 .../syslinux}/archiso_pxe-linux.cfg | 0 .../syslinux}/archiso_pxe.cfg | 0 .../syslinux}/archiso_sys-linux.cfg | 0 .../syslinux}/archiso_sys.cfg | 0 .../syslinux}/archiso_tail.cfg | 0 {syslinux => archiso/syslinux}/splash.png | Bin {syslinux => archiso/syslinux}/syslinux.cfg | 0 build.sh | 18 +- cleanup-v1.sh | 39 +- git-v2.sh | 2 + .../30-build-the-iso-the-first-time.sh | 306 ++++++++ .../40-build-the-iso-local-again.sh | 306 ++++++++ 87 files changed, 2735 insertions(+), 127 deletions(-) create mode 100644 LICENSE delete mode 100644 airootfs/etc/passwd delete mode 100644 airootfs/etc/shadow delete mode 100755 airootfs/root/customize_airootfs.sh rename {airootfs => archiso/airootfs}/etc/default/grub (100%) create mode 100644 archiso/airootfs/etc/group rename {airootfs => archiso/airootfs}/etc/hostname (100%) rename {airootfs => archiso/airootfs}/etc/locale.conf (100%) rename {airootfs => archiso/airootfs}/etc/localtime (100%) rename {airootfs => archiso/airootfs}/etc/mkinitcpio.conf (100%) rename {airootfs => archiso/airootfs}/etc/mkinitcpio.d/linux.preset (100%) rename {airootfs => archiso/airootfs}/etc/modprobe.d/broadcom-wl.conf (100%) rename {airootfs => archiso/airootfs}/etc/motd (100%) create mode 100644 archiso/airootfs/etc/pacman-more.conf create mode 100644 archiso/airootfs/etc/pacman.conf rename {airootfs => archiso/airootfs}/etc/pacman.d/gnupg/gpg.conf (100%) rename {airootfs => archiso/airootfs}/etc/pacman.d/mirrorlist (100%) create mode 100644 archiso/airootfs/etc/passwd rename {airootfs => archiso/airootfs}/etc/polkit-1/rules.d/49-nopasswd_global.rules (100%) rename {airootfs => archiso/airootfs}/etc/resolv.conf (100%) rename {airootfs => archiso/airootfs}/etc/sddm.conf.d/autologin.conf (100%) create mode 100644 archiso/airootfs/etc/shadow rename {airootfs => archiso/airootfs}/etc/skel/.config/i3/config (87%) rename {airootfs => archiso/airootfs}/etc/ssh/sshd_config (100%) rename {airootfs => archiso/airootfs}/etc/sudoers.d/g_wheel (100%) create mode 100644 archiso/airootfs/etc/systemd/journald.conf rename {airootfs => archiso/airootfs}/etc/systemd/journald.conf.d/volatile-storage.conf (100%) create mode 100644 archiso/airootfs/etc/systemd/logind.conf rename {airootfs => archiso/airootfs}/etc/systemd/logind.conf.d/do-not-suspend.conf (100%) rename {airootfs => archiso/airootfs}/etc/systemd/network/20-ethernet.network (100%) rename {airootfs => archiso/airootfs}/etc/systemd/network/20-wireless.network (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/choose-mirror.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/dbus-org.freedesktop.network1.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/dbus-org.freedesktop.resolve1.service (100%) create mode 120000 archiso/airootfs/etc/systemd/system/default.target create mode 120000 archiso/airootfs/etc/systemd/system/display-manager.service rename {airootfs => archiso/airootfs}/etc/systemd/system/etc-pacman.d-gnupg.mount (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/getty@tty1.service.d/autologin.conf (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/livecd-alsa-unmuter.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/livecd-talk.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/multi-user.target.wants/choose-mirror.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/multi-user.target.wants/iwd.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/multi-user.target.wants/livecd-talk.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/multi-user.target.wants/pacman-init.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/multi-user.target.wants/reflector.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/multi-user.target.wants/systemd-networkd.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/multi-user.target.wants/systemd-resolved.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/pacman-init.service (87%) rename {airootfs => archiso/airootfs}/etc/systemd/system/reflector.service.d/archiso.conf (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/sockets.target.wants/systemd-networkd.socket (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service (100%) rename {airootfs => archiso/airootfs}/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf (100%) rename {airootfs => archiso/airootfs}/etc/xdg/reflector/reflector.conf (100%) rename {airootfs => archiso/airootfs}/root/.automated_script.sh (100%) rename {airootfs => archiso/airootfs}/root/.zlogin (100%) rename {airootfs => archiso/airootfs}/usr/local/bin/Installation_guide (100%) rename {airootfs => archiso/airootfs}/usr/local/bin/choose-mirror (100%) rename {airootfs => archiso/airootfs}/usr/local/bin/livecd-sound (100%) rename {airootfs => archiso/airootfs}/usr/local/share/livecd-sound/asound.conf.in (100%) create mode 100644 archiso/arcolinux-chaotic-pacman.conf create mode 100644 archiso/arcolinux-pacman.conf create mode 100644 archiso/chaotic-pacman.conf rename {efiboot => archiso/efiboot}/loader/entries/archiso-x86_64-linux.conf (100%) rename {efiboot => archiso/efiboot}/loader/entries/archiso-x86_64-speech-linux.conf (100%) rename {efiboot => archiso/efiboot}/loader/loader.conf (100%) create mode 100644 archiso/example-packages.x86_64 rename pacman.conf => archiso/no-extra-pacman.conf (99%) create mode 100644 archiso/original-packages.x86_64 rename packages.x86_64 => archiso/packages.x86_64 (87%) create mode 100644 archiso/pacman.conf rename profiledef.sh => archiso/profiledef.sh (91%) rename {syslinux => archiso/syslinux}/archiso_head.cfg (100%) rename {syslinux => archiso/syslinux}/archiso_pxe-linux.cfg (100%) rename {syslinux => archiso/syslinux}/archiso_pxe.cfg (100%) rename {syslinux => archiso/syslinux}/archiso_sys-linux.cfg (100%) rename {syslinux => archiso/syslinux}/archiso_sys.cfg (100%) rename {syslinux => archiso/syslinux}/archiso_tail.cfg (100%) rename {syslinux => archiso/syslinux}/splash.png (100%) rename {syslinux => archiso/syslinux}/syslinux.cfg (100%) create mode 100755 installation-scripts/30-build-the-iso-the-first-time.sh create mode 100755 installation-scripts/40-build-the-iso-local-again.sh diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6b156fe --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ +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. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +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: + + {project} Copyright (C) {year} {fullname} + 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/README.md b/README.md index 80f27a8..91c3ad9 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,154 @@ +# DEVELOPMENT + # Arch Linux Calamares Installer or ALCI Use the correct version for building the iso. -Read the archiso.readme. +**Read the archiso.readme.** -Download the content of the github with (in terminal) +Download the content of the github with (use the terminal) -git clone https://github.com/arcolinuxiso/alci-iso +`git clone https://github.com/arcolinuxiso/alci-iso` -Change the content of packages.x86-64 or not. +# Pacman.conf in archiso -Start building your own ALCI version with +Only the archiso/pacman.conf will be used to download your packages. -sudo ./build.sh -v +We created several versions of pacman.conf to be able to switch fast. -You will get an iso in the OUT folder. +In order to avoid future questions we activated multilib by default on all except no-extra-pacman.conf. -Burn it and use it. +In order to switch fast we copy/paste the content of the other files in archiso/pacman.conf. -Still not sure what to do + arcolinux-chaotic-pacman.conf + contains both ArcoLinux and chaotic-aur + needs extra packages - mirrorlist and keys + + arcolinux-pacman.conf + contains only ArcoLinux + needs extra packages - mirrorlist and keys + + chaotic-pacman.conf + contains only chaotic-aur + needs extra packages - mirrorlist and keys + + no-extra-pacman.conf + as vanilla as Arch Linux + needs NO extra packages - mirrorlist and keys - no multilib + +# Pacman.conf in archiso/airootfs/etc/ + +This will be your future system. +Include the repositories you want. +It will not be used to build the iso. + + +# Keys and Mirrors + +## ArcoLinux keys and mirror + +Since this is an ArcoLinux project after all, the ArcoLinux keys are in by default. +Want a vanilla Arch Linux without any ArcoLinux packages then you do not need our keys. +Delete the ArcoLinux line in +`/archiso/airootfs/etc/systemd/system/pacman-init.service` +and they will not be installed. + +## Chaotic keys and mirror + +If you want to include packages from the Chaotic-aur repo then add its packages to archiso/packages.x86-64. + + +# Archiso/packages.x86_64 + +Only the archiso/packages.x86-64 files will be used. + +Check the bottom of the file and install the necessary packages + +If you plan to use ArcoLinux packages + +* arcolinux-keyring + +* arcolinux-mirror + +If you plan to use Chaotic packages + +* chaotic-keyring + +* chaotic-mirror + +Now you can add the packagename from the repo. + +We have added a backup of the original file called original.packages.x86_64. +We have added an example called example-packages.x86_64. + +Use meld to compare differences. + + +# Build process + +Install these two packages on your system if you want to include Chaotic packages on the iso + +`sudo pacman -S chaotic-mirror chaotic-keyring` + +Accept the **key of Pedro** from Chaotic during installation or install chaotic-keyring. + +After editing the necessary files you can start building. + +Use the scripts from this folder: + +installation-scripts + +Use script 30 and it will clean your pacman cache and redownload every package it needs. + +Use script 40 to use your current pacman cache - it will only download what is needed + +You will find the iso in this folder: + + ~/Alci-Out + +Burn it with etcher or other tools and use it. + +Still not sure what to do. Check out the playlist on Youtube -Want to have a /etc/pacman.conf with the repos you like, add it to the the folder /airootfs/etc/ -and it will be on your future system. +https://www.youtube.com/playlist?list=PLlloYVGq5pS4vhYQuLikS8dhDjk6xaiXH -https://www.youtube.com/playlist?list=PLlloYVGq5pS4vhYQuLikS8dhDjk6xaiXH \ No newline at end of file + +# Arch Linux users + +In order to get the keys in from ArcoLinux and Chaotic. + +ArcoLinux + +Both packages are on github. Keys and mirrors. +https://github.com/arcolinuxiso/alci_repo/tree/master/x86_64 +Download them and install them via pacman -U ... + + +Chaotic + +Both packages are on the AUR. Keys and mirrors. + + +# Tip + +Sometime a "proc" folder stays mounted. + +Unmount it with this + +sudo umount /home/{username}/... use the TAB + + +# Tip + +We have added a /etc/pacman-more.conf file to your future system. +That way we have the ArcoLinux repos and Chaotic repos if we do decide to install it after all. +Remember to install the mirror and keys. + +# History + +The list of packages after a clean installation - no extras + +2021-01-29 +https://pastebin.com/kjYyrKZx \ No newline at end of file diff --git a/airootfs/etc/passwd b/airootfs/etc/passwd deleted file mode 100644 index 2807d5d..0000000 --- a/airootfs/etc/passwd +++ /dev/null @@ -1 +0,0 @@ -root:x:0:0:root:/root:/usr/bin/zsh diff --git a/airootfs/etc/shadow b/airootfs/etc/shadow deleted file mode 100644 index 7edfd69..0000000 --- a/airootfs/etc/shadow +++ /dev/null @@ -1 +0,0 @@ -root::14871:::::: diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh deleted file mode 100755 index 7ced89c..0000000 --- a/airootfs/root/customize_airootfs.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e -u - -# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version. - -sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen -locale-gen - -ln -sf /usr/share/zoneinfo/UTC /etc/localtime - -usermod -s /usr/bin/zsh root -cp -aT /etc/skel/ /root/ -chmod 700 /root -# unset the root password -passwd -d root - -sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config -sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf - -sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf -sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf -sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf - -systemctl enable pacman-init.service choose-mirror.service systemd-networkd.service systemd-resolved.service -systemctl set-default graphical.target -systemctl enable sddm.service - -pacman-key --init -pacman-key --populate archlinux - -groupsalci="adm,audio,disk,floppy,log,network,optical,rfkill,storage,video,wheel,sys" -useradd -m -g users -G $groupsalci -s /bin/bash liveuser -passwd -d liveuser - -#set permissions -chmod 750 /etc/sudoers.d -chmod 750 /etc/polkit-1/rules.d -chgrp polkitd /etc/polkit-1/rules.d diff --git a/archiso.readme b/archiso.readme index 986b402..03b1b44 100644 --- a/archiso.readme +++ b/archiso.readme @@ -1,6 +1,6 @@ You can build this iso if you have the right version of Archiso. -Archiso is a package supplied by Arch Linux that is recently undergoing some major changes. +Archiso is a package supplied by Arch Linux that will always undergo changes. You can follow up the versions via this link. @@ -9,7 +9,7 @@ https://www.archlinux.org/packages/extra/any/archiso/ We are now using this version -archiso-version=50.1-1 +archiso-version=archiso 50.1-1 sudo pacman -Q archiso and you will know your version diff --git a/airootfs/etc/default/grub b/archiso/airootfs/etc/default/grub similarity index 100% rename from airootfs/etc/default/grub rename to archiso/airootfs/etc/default/grub diff --git a/archiso/airootfs/etc/group b/archiso/airootfs/etc/group new file mode 100644 index 0000000..2f50b54 --- /dev/null +++ b/archiso/airootfs/etc/group @@ -0,0 +1,16 @@ +root:x:0:root +sys:x:3:bin,liveuser +network:x:90:liveuser +power:x:98:liveuser +adm:x:999:liveuser +wheel:x:998:liveuser +uucp:x:987:liveuser +optical:x:990:liveuser +rfkill:x:983:liveuser +video:x:986:liveuser +storage:x:988:liveuser +audio:x:995:liveuser +users:x:985:liveuser +nopasswdlogin:x:966:liveuser +autologin:x:967:liveuser +liveuser:x:1000: \ No newline at end of file diff --git a/airootfs/etc/hostname b/archiso/airootfs/etc/hostname similarity index 100% rename from airootfs/etc/hostname rename to archiso/airootfs/etc/hostname diff --git a/airootfs/etc/locale.conf b/archiso/airootfs/etc/locale.conf similarity index 100% rename from airootfs/etc/locale.conf rename to archiso/airootfs/etc/locale.conf diff --git a/airootfs/etc/localtime b/archiso/airootfs/etc/localtime similarity index 100% rename from airootfs/etc/localtime rename to archiso/airootfs/etc/localtime diff --git a/airootfs/etc/mkinitcpio.conf b/archiso/airootfs/etc/mkinitcpio.conf similarity index 100% rename from airootfs/etc/mkinitcpio.conf rename to archiso/airootfs/etc/mkinitcpio.conf diff --git a/airootfs/etc/mkinitcpio.d/linux.preset b/archiso/airootfs/etc/mkinitcpio.d/linux.preset similarity index 100% rename from airootfs/etc/mkinitcpio.d/linux.preset rename to archiso/airootfs/etc/mkinitcpio.d/linux.preset diff --git a/airootfs/etc/modprobe.d/broadcom-wl.conf b/archiso/airootfs/etc/modprobe.d/broadcom-wl.conf similarity index 100% rename from airootfs/etc/modprobe.d/broadcom-wl.conf rename to archiso/airootfs/etc/modprobe.d/broadcom-wl.conf diff --git a/airootfs/etc/motd b/archiso/airootfs/etc/motd similarity index 100% rename from airootfs/etc/motd rename to archiso/airootfs/etc/motd diff --git a/archiso/airootfs/etc/pacman-more.conf b/archiso/airootfs/etc/pacman-more.conf new file mode 100644 index 0000000..08839b1 --- /dev/null +++ b/archiso/airootfs/etc/pacman-more.conf @@ -0,0 +1,122 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[arcolinux_repo_testing] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_3party] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_xlarge] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +[chaotic-aur] +Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/archiso/airootfs/etc/pacman.conf b/archiso/airootfs/etc/pacman.conf new file mode 100644 index 0000000..883e2ed --- /dev/null +++ b/archiso/airootfs/etc/pacman.conf @@ -0,0 +1,102 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs \ No newline at end of file diff --git a/airootfs/etc/pacman.d/gnupg/gpg.conf b/archiso/airootfs/etc/pacman.d/gnupg/gpg.conf similarity index 100% rename from airootfs/etc/pacman.d/gnupg/gpg.conf rename to archiso/airootfs/etc/pacman.d/gnupg/gpg.conf diff --git a/airootfs/etc/pacman.d/mirrorlist b/archiso/airootfs/etc/pacman.d/mirrorlist similarity index 100% rename from airootfs/etc/pacman.d/mirrorlist rename to archiso/airootfs/etc/pacman.d/mirrorlist diff --git a/archiso/airootfs/etc/passwd b/archiso/airootfs/etc/passwd new file mode 100644 index 0000000..da8dd66 --- /dev/null +++ b/archiso/airootfs/etc/passwd @@ -0,0 +1,2 @@ +root:x:0:0:root:/root:/usr/bin/zsh +liveuser:x:1000:1000::/home/liveuser:/bin/bash diff --git a/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules b/archiso/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules similarity index 100% rename from airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules rename to archiso/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules diff --git a/airootfs/etc/resolv.conf b/archiso/airootfs/etc/resolv.conf similarity index 100% rename from airootfs/etc/resolv.conf rename to archiso/airootfs/etc/resolv.conf diff --git a/airootfs/etc/sddm.conf.d/autologin.conf b/archiso/airootfs/etc/sddm.conf.d/autologin.conf similarity index 100% rename from airootfs/etc/sddm.conf.d/autologin.conf rename to archiso/airootfs/etc/sddm.conf.d/autologin.conf diff --git a/archiso/airootfs/etc/shadow b/archiso/airootfs/etc/shadow new file mode 100644 index 0000000..3692488 --- /dev/null +++ b/archiso/airootfs/etc/shadow @@ -0,0 +1,2 @@ +root::14871:::::: +liveuser::14871:::::: \ No newline at end of file diff --git a/airootfs/etc/skel/.config/i3/config b/archiso/airootfs/etc/skel/.config/i3/config similarity index 87% rename from airootfs/etc/skel/.config/i3/config rename to archiso/airootfs/etc/skel/.config/i3/config index 748e729..f5ff671 100644 --- a/airootfs/etc/skel/.config/i3/config +++ b/archiso/airootfs/etc/skel/.config/i3/config @@ -245,6 +245,9 @@ font pango:Noto Mono Regular 13 # ALCI launch calamares exec --no-startup-id dex /etc/xdg/autostart/calamares.desktop +#Authentication dialog +exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & + ##################################################################################################################### ################# applications keyboard shortcuts ################# ##################################################################################################################### @@ -309,46 +312,3 @@ gaps outer 5 smart_gaps on #smart_borders on -##################################################################################################################### -##################################################################################################################### -##################################################################################################################### -################# bar appearance ################# -##################################################################################################################### -##################################################################################################################### -##################################################################################################################### - -bar { - - height 25 - workspace_buttons yes - font pango:Noto Sans 14 - - position top - #position bottom - - status_command i3status - - colors { - background #2F2F2F - statusline #eeeeee - separator #666666 - - # colorclass border backgr. text - focused_workspace #a9a9a9 #5f676a #eeeeee - active_workspace #a9a9a9 #5f676a #eeeeee - inactive_workspace #a9a9a9 #222222 #a9a9a9 - urgent_workspace #a9a9a9 #d42121 #FFFFFF - } - - } - - # Window color settings - # class border backgr. text indicator - client.focused #6790EB #6790EB #e5e5e5 #6790EB - client.unfocused #222222 #222222 #aaaaaa #222222 - client.focused_inactive #222222 #222222 #a9a9a9 #222222 - client.placeholder #222222 #222222 #aaaaaa #222222 - client.urgent #d42121 #d42121 #f7f7f7 #d42121 - - client.background #242424 - diff --git a/airootfs/etc/ssh/sshd_config b/archiso/airootfs/etc/ssh/sshd_config similarity index 100% rename from airootfs/etc/ssh/sshd_config rename to archiso/airootfs/etc/ssh/sshd_config diff --git a/airootfs/etc/sudoers.d/g_wheel b/archiso/airootfs/etc/sudoers.d/g_wheel similarity index 100% rename from airootfs/etc/sudoers.d/g_wheel rename to archiso/airootfs/etc/sudoers.d/g_wheel diff --git a/archiso/airootfs/etc/systemd/journald.conf b/archiso/airootfs/etc/systemd/journald.conf new file mode 100644 index 0000000..6e11247 --- /dev/null +++ b/archiso/airootfs/etc/systemd/journald.conf @@ -0,0 +1,44 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See journald.conf(5) for details. + +[Journal] +Storage=volatile +#Compress=yes +#Seal=yes +#SplitMode=uid +#SyncIntervalSec=5m +#RateLimitIntervalSec=30s +#RateLimitBurst=10000 +#SystemMaxUse= +#SystemKeepFree= +#SystemMaxFileSize= +#SystemMaxFiles=100 +#RuntimeMaxUse= +#RuntimeKeepFree= +#RuntimeMaxFileSize= +#RuntimeMaxFiles=100 +#MaxRetentionSec= +#MaxFileSec=1month +#ForwardToSyslog=no +#ForwardToKMsg=no +#ForwardToConsole=no +#ForwardToWall=yes +#TTYPath=/dev/console +#MaxLevelStore=debug +#MaxLevelSyslog=debug +#MaxLevelKMsg=notice +#MaxLevelConsole=info +#MaxLevelWall=emerg +#LineMax=48K +#ReadKMsg=yes +#Audit=yes diff --git a/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/archiso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf similarity index 100% rename from airootfs/etc/systemd/journald.conf.d/volatile-storage.conf rename to archiso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf diff --git a/archiso/airootfs/etc/systemd/logind.conf b/archiso/airootfs/etc/systemd/logind.conf new file mode 100644 index 0000000..72b3254 --- /dev/null +++ b/archiso/airootfs/etc/systemd/logind.conf @@ -0,0 +1,38 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See logind.conf(5) for details. + +[Login] +#NAutoVTs=6 +#ReserveVT=6 +#KillUserProcesses=no +#KillOnlyUsers= +#KillExcludeUsers=root +#InhibitDelayMaxSec=5 +#HandlePowerKey=poweroff +HandleSuspendKey=ignore +HandleHibernateKey=ignore +HandleLidSwitch=ignore +#HandleLidSwitchExternalPower=suspend +#HandleLidSwitchDocked=ignore +#PowerKeyIgnoreInhibited=no +#SuspendKeyIgnoreInhibited=no +#HibernateKeyIgnoreInhibited=no +#LidSwitchIgnoreInhibited=yes +#HoldoffTimeoutSec=30s +#IdleAction=ignore +#IdleActionSec=30min +#RuntimeDirectorySize=10% +#RuntimeDirectoryInodes=400k +#RemoveIPC=yes +#InhibitorsMax=8192 +#SessionsMax=8192 diff --git a/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/archiso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf similarity index 100% rename from airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf rename to archiso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf diff --git a/airootfs/etc/systemd/network/20-ethernet.network b/archiso/airootfs/etc/systemd/network/20-ethernet.network similarity index 100% rename from airootfs/etc/systemd/network/20-ethernet.network rename to archiso/airootfs/etc/systemd/network/20-ethernet.network diff --git a/airootfs/etc/systemd/network/20-wireless.network b/archiso/airootfs/etc/systemd/network/20-wireless.network similarity index 100% rename from airootfs/etc/systemd/network/20-wireless.network rename to archiso/airootfs/etc/systemd/network/20-wireless.network diff --git a/airootfs/etc/systemd/system/choose-mirror.service b/archiso/airootfs/etc/systemd/system/choose-mirror.service similarity index 100% rename from airootfs/etc/systemd/system/choose-mirror.service rename to archiso/airootfs/etc/systemd/system/choose-mirror.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service rename to archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service rename to archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service diff --git a/archiso/airootfs/etc/systemd/system/default.target b/archiso/airootfs/etc/systemd/system/default.target new file mode 120000 index 0000000..cf9fa51 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/default.target @@ -0,0 +1 @@ +/usr/lib/systemd/system/graphical.target \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/display-manager.service b/archiso/airootfs/etc/systemd/system/display-manager.service new file mode 120000 index 0000000..56f1df2 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/display-manager.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/sddm.service \ No newline at end of file diff --git a/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount similarity index 100% rename from airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount rename to archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount diff --git a/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/archiso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf similarity index 100% rename from airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf rename to archiso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf diff --git a/airootfs/etc/systemd/system/livecd-alsa-unmuter.service b/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service similarity index 100% rename from airootfs/etc/systemd/system/livecd-alsa-unmuter.service rename to archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service diff --git a/airootfs/etc/systemd/system/livecd-talk.service b/archiso/airootfs/etc/systemd/system/livecd-talk.service similarity index 100% rename from airootfs/etc/systemd/system/livecd-talk.service rename to archiso/airootfs/etc/systemd/system/livecd-talk.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service rename to archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/iwd.service rename to archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service rename to archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service rename to archiso/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/reflector.service rename to archiso/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service rename to archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service rename to archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service diff --git a/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service similarity index 100% rename from airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service rename to archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service diff --git a/airootfs/etc/systemd/system/pacman-init.service b/archiso/airootfs/etc/systemd/system/pacman-init.service similarity index 87% rename from airootfs/etc/systemd/system/pacman-init.service rename to archiso/airootfs/etc/systemd/system/pacman-init.service index 3adec4c..5d5fb85 100644 --- a/airootfs/etc/systemd/system/pacman-init.service +++ b/archiso/airootfs/etc/systemd/system/pacman-init.service @@ -13,6 +13,7 @@ Type=oneshot RemainAfterExit=yes ExecStart=/usr/bin/pacman-key --init ExecStart=/usr/bin/pacman-key --populate archlinux +ExecStart=/usr/bin/pacman-key --populate arcolinux [Install] WantedBy=multi-user.target diff --git a/airootfs/etc/systemd/system/reflector.service.d/archiso.conf b/archiso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf similarity index 100% rename from airootfs/etc/systemd/system/reflector.service.d/archiso.conf rename to archiso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf diff --git a/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket similarity index 100% rename from airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket rename to archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket diff --git a/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service b/archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service similarity index 100% rename from airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service rename to archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service diff --git a/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf similarity index 100% rename from airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf rename to archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf diff --git a/airootfs/etc/xdg/reflector/reflector.conf b/archiso/airootfs/etc/xdg/reflector/reflector.conf similarity index 100% rename from airootfs/etc/xdg/reflector/reflector.conf rename to archiso/airootfs/etc/xdg/reflector/reflector.conf diff --git a/airootfs/root/.automated_script.sh b/archiso/airootfs/root/.automated_script.sh similarity index 100% rename from airootfs/root/.automated_script.sh rename to archiso/airootfs/root/.automated_script.sh diff --git a/airootfs/root/.zlogin b/archiso/airootfs/root/.zlogin similarity index 100% rename from airootfs/root/.zlogin rename to archiso/airootfs/root/.zlogin diff --git a/airootfs/usr/local/bin/Installation_guide b/archiso/airootfs/usr/local/bin/Installation_guide similarity index 100% rename from airootfs/usr/local/bin/Installation_guide rename to archiso/airootfs/usr/local/bin/Installation_guide diff --git a/airootfs/usr/local/bin/choose-mirror b/archiso/airootfs/usr/local/bin/choose-mirror similarity index 100% rename from airootfs/usr/local/bin/choose-mirror rename to archiso/airootfs/usr/local/bin/choose-mirror diff --git a/airootfs/usr/local/bin/livecd-sound b/archiso/airootfs/usr/local/bin/livecd-sound similarity index 100% rename from airootfs/usr/local/bin/livecd-sound rename to archiso/airootfs/usr/local/bin/livecd-sound diff --git a/airootfs/usr/local/share/livecd-sound/asound.conf.in b/archiso/airootfs/usr/local/share/livecd-sound/asound.conf.in similarity index 100% rename from airootfs/usr/local/share/livecd-sound/asound.conf.in rename to archiso/airootfs/usr/local/share/livecd-sound/asound.conf.in diff --git a/archiso/arcolinux-chaotic-pacman.conf b/archiso/arcolinux-chaotic-pacman.conf new file mode 100644 index 0000000..79c07ab --- /dev/null +++ b/archiso/arcolinux-chaotic-pacman.conf @@ -0,0 +1,129 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[arcolinux_repo_testing] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_3party] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_xlarge] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs + +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arcolinuxiso.github.io/$repo/$arch + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +[chaotic-aur] +Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/archiso/arcolinux-pacman.conf b/archiso/arcolinux-pacman.conf new file mode 100644 index 0000000..975a5c7 --- /dev/null +++ b/archiso/arcolinux-pacman.conf @@ -0,0 +1,122 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[arcolinux_repo_testing] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_3party] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_xlarge] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs + +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arcolinuxiso.github.io/$repo/$arch \ No newline at end of file diff --git a/archiso/chaotic-pacman.conf b/archiso/chaotic-pacman.conf new file mode 100644 index 0000000..9342258 --- /dev/null +++ b/archiso/chaotic-pacman.conf @@ -0,0 +1,113 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs + +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arcolinuxiso.github.io/$repo/$arch + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +[chaotic-aur] +Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/efiboot/loader/entries/archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/archiso-x86_64-linux.conf similarity index 100% rename from efiboot/loader/entries/archiso-x86_64-linux.conf rename to archiso/efiboot/loader/entries/archiso-x86_64-linux.conf diff --git a/efiboot/loader/entries/archiso-x86_64-speech-linux.conf b/archiso/efiboot/loader/entries/archiso-x86_64-speech-linux.conf similarity index 100% rename from efiboot/loader/entries/archiso-x86_64-speech-linux.conf rename to archiso/efiboot/loader/entries/archiso-x86_64-speech-linux.conf diff --git a/efiboot/loader/loader.conf b/archiso/efiboot/loader/loader.conf similarity index 100% rename from efiboot/loader/loader.conf rename to archiso/efiboot/loader/loader.conf diff --git a/archiso/example-packages.x86_64 b/archiso/example-packages.x86_64 new file mode 100644 index 0000000..69941ef --- /dev/null +++ b/archiso/example-packages.x86_64 @@ -0,0 +1,204 @@ +# +# 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 +crda +darkhttpd +ddrescue +dhclient +dhcpcd +diffutils +dmraid +dnsmasq +dosfstools +edk2-shell +efibootmgr +espeakup +ethtool +exfatprogs +f2fs-tools +fatresize +fsarchiver +gnu-netcat +gpart +gpm +gptfdisk +grml-zsh-config +haveged +hdparm +intel-ucode +ipw2100-fw +ipw2200-fw +irssi +iwd +jfsutils +kitty-terminfo +lftp +linux +linux-atm +linux-firmware +livecd-sounds +lsscsi +lvm2 +lynx +man-db +man-pages +mc +mdadm +memtest86+ +mkinitcpio +mkinitcpio-archiso +mkinitcpio-nfs-utils +mtools +nano +nbd +ndisc6 +nfs-utils +nilfs-utils +nmap +ntfs-3g +nvme-cli +openconnect +openssh +openvpn +partclone +parted +partimage +ppp +pptpclient +reflector +reiserfsprogs +rp-pppoe +rsync +rxvt-unicode-terminfo +sdparm +sg3_utils +smartmontools +squashfs-tools +sudo +syslinux +systemd-resolvconf +tcpdump +terminus-font +termite-terminfo +testdisk +tmux +udftools +usb_modeswitch +usbutils +vim +vpnc +wireless-regdb +wireless_tools +wpa_supplicant +wvdial +xfsprogs +xl2tpd +zsh + + +# everything above comes from archiso releng folder +####################################################### +### ALCI ### +####################################################### + +####################################################### +### PACKAGES THAT ARE REMOVED AFTER INSTALLATION ### +### CALAMARES CONFIG ### +####################################################### + +sddm + +i3-gaps + +alci-calamares +alci-calamares-config +#alci-calamares-config-dev +xterm +dex + +####################################################### +### PACKAGES THAT STAY AFTER INSTALLATION ### +####################################################### + +bash-completion +grub +os-prober + +####################################################### +### EXTRAS ### +####################################################### + +##### xorg applications + +xorg-server +xorg-apps + + + +##### lightdm display manager + +lightdm +lightdm-gtk-greeter + +##### sddm display manager + +#sddm + +##### gdm display manager + +#gdm + + + +##### want to have nmtui to connect to your wireless network via TTY +##### install the package networkmanager on the iso +##### enable after installation +##### sudo systemctl enable NetworkManager +##### and then reboot + +networkmanager + + + +##### want to have base-devel group + +base-devel + +##### want to have linux-headers + +linux-headers + + + +##### want to have a desktop + +#test +xfce4 +xfce4-goodies + + + +##### want to add/use the ArcoLinux repos + +arcolinux-mirrorlist-git +arcolinux-keyring + +#test +arcolinux-wallpapers-git + +##### want to add/use the Chaotic repo + +chaotic-mirrorlist +chaotic-keyring + +#test +picom-ibhagwan-git diff --git a/pacman.conf b/archiso/no-extra-pacman.conf similarity index 99% rename from pacman.conf rename to archiso/no-extra-pacman.conf index 730f3d0..ba93379 100644 --- a/pacman.conf +++ b/archiso/no-extra-pacman.conf @@ -104,3 +104,4 @@ Include = /etc/pacman.d/mirrorlist [alci_repo] SigLevel = Optional TrustedOnly Server = https://arcolinuxiso.github.io/$repo/$arch + diff --git a/archiso/original-packages.x86_64 b/archiso/original-packages.x86_64 new file mode 100644 index 0000000..2ea3074 --- /dev/null +++ b/archiso/original-packages.x86_64 @@ -0,0 +1,204 @@ +# +# 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 +crda +darkhttpd +ddrescue +dhclient +dhcpcd +diffutils +dmraid +dnsmasq +dosfstools +edk2-shell +efibootmgr +espeakup +ethtool +exfatprogs +f2fs-tools +fatresize +fsarchiver +gnu-netcat +gpart +gpm +gptfdisk +grml-zsh-config +haveged +hdparm +intel-ucode +ipw2100-fw +ipw2200-fw +irssi +iwd +jfsutils +kitty-terminfo +lftp +linux +linux-atm +linux-firmware +livecd-sounds +lsscsi +lvm2 +lynx +man-db +man-pages +mc +mdadm +memtest86+ +mkinitcpio +mkinitcpio-archiso +mkinitcpio-nfs-utils +mtools +nano +nbd +ndisc6 +nfs-utils +nilfs-utils +nmap +ntfs-3g +nvme-cli +openconnect +openssh +openvpn +partclone +parted +partimage +ppp +pptpclient +reflector +reiserfsprogs +rp-pppoe +rsync +rxvt-unicode-terminfo +sdparm +sg3_utils +smartmontools +squashfs-tools +sudo +syslinux +systemd-resolvconf +tcpdump +terminus-font +termite-terminfo +testdisk +tmux +udftools +usb_modeswitch +usbutils +vim +vpnc +wireless-regdb +wireless_tools +wpa_supplicant +wvdial +xfsprogs +xl2tpd +zsh + + +# everything above comes from archiso releng folder +####################################################### +### ALCI ### +####################################################### + +####################################################### +### PACKAGES THAT ARE REMOVED AFTER INSTALLATION ### +### CALAMARES CONFIG ### +####################################################### + +sddm + +i3-gaps + +alci-calamares +alci-calamares-config +#alci-calamares-config-dev +xterm +dex + +####################################################### +### PACKAGES THAT STAY AFTER INSTALLATION ### +####################################################### + +bash-completion +grub +os-prober + +####################################################### +### EXTRAS ### +####################################################### + +##### xorg applications + +#xorg-server +#xorg-apps + + + +##### lightdm display manager + +#lightdm +#lightdm-gtk-greeter + +##### sddm display manager + +#sddm + +##### gdm display manager + +#gdm + + + +##### want to have nmtui to connect to your wireless network via TTY +##### install the package networkmanager on the iso +##### enable after installation +##### sudo systemctl enable NetworkManager +##### and then reboot + +#networkmanager + + + +##### want to have base-devel group + +#base-devel + +##### want to have linux-headers + +#linux-headers + + + +##### want to have a desktop + +#test +#xfce4 +#xfce4-goodies + + + +##### want to add/use the ArcoLinux repos + +#arcolinux-mirrorlist-git +#arcolinux-keyring + +#test +#arcolinux-wallpapers-git + +##### want to add/use the Chaotic repo + +#chaotic-mirrorlist +#chaotic-keyring + +#test +#picom-ibhagwan-git \ No newline at end of file diff --git a/packages.x86_64 b/archiso/packages.x86_64 similarity index 87% rename from packages.x86_64 rename to archiso/packages.x86_64 index 7f0f483..2ea3074 100644 --- a/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -118,9 +118,8 @@ zsh sddm i3-gaps -i3status -calamares +alci-calamares alci-calamares-config #alci-calamares-config-dev xterm @@ -143,6 +142,8 @@ os-prober #xorg-server #xorg-apps + + ##### lightdm display manager #lightdm @@ -152,6 +153,12 @@ os-prober #sddm +##### gdm display manager + +#gdm + + + ##### want to have nmtui to connect to your wireless network via TTY ##### install the package networkmanager on the iso ##### enable after installation @@ -160,6 +167,8 @@ os-prober #networkmanager + + ##### want to have base-devel group #base-devel @@ -167,3 +176,29 @@ os-prober ##### want to have linux-headers #linux-headers + + + +##### want to have a desktop + +#test +#xfce4 +#xfce4-goodies + + + +##### want to add/use the ArcoLinux repos + +#arcolinux-mirrorlist-git +#arcolinux-keyring + +#test +#arcolinux-wallpapers-git + +##### want to add/use the Chaotic repo + +#chaotic-mirrorlist +#chaotic-keyring + +#test +#picom-ibhagwan-git \ No newline at end of file diff --git a/archiso/pacman.conf b/archiso/pacman.conf new file mode 100644 index 0000000..79c07ab --- /dev/null +++ b/archiso/pacman.conf @@ -0,0 +1,129 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[arcolinux_repo_testing] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_3party] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +[arcolinux_repo_xlarge] +SigLevel = Required DatabaseOptional +Include = /etc/pacman.d/arcolinux-mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs + +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arcolinuxiso.github.io/$repo/$arch + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +[chaotic-aur] +Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/profiledef.sh b/archiso/profiledef.sh similarity index 91% rename from profiledef.sh rename to archiso/profiledef.sh index 8311703..b845ae1 100644 --- a/profiledef.sh +++ b/archiso/profiledef.sh @@ -15,6 +15,8 @@ airootfs_image_tool_options=('-comp' 'xz') file_permissions=( ["/etc/shadow"]="0:0:400" ["/root"]="0:0:750" + ["/etc/polkit-1/rules.d"]="0:0:750" + ["/etc/sudoers.d"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" diff --git a/syslinux/archiso_head.cfg b/archiso/syslinux/archiso_head.cfg similarity index 100% rename from syslinux/archiso_head.cfg rename to archiso/syslinux/archiso_head.cfg diff --git a/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg similarity index 100% rename from syslinux/archiso_pxe-linux.cfg rename to archiso/syslinux/archiso_pxe-linux.cfg diff --git a/syslinux/archiso_pxe.cfg b/archiso/syslinux/archiso_pxe.cfg similarity index 100% rename from syslinux/archiso_pxe.cfg rename to archiso/syslinux/archiso_pxe.cfg diff --git a/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg similarity index 100% rename from syslinux/archiso_sys-linux.cfg rename to archiso/syslinux/archiso_sys-linux.cfg diff --git a/syslinux/archiso_sys.cfg b/archiso/syslinux/archiso_sys.cfg similarity index 100% rename from syslinux/archiso_sys.cfg rename to archiso/syslinux/archiso_sys.cfg diff --git a/syslinux/archiso_tail.cfg b/archiso/syslinux/archiso_tail.cfg similarity index 100% rename from syslinux/archiso_tail.cfg rename to archiso/syslinux/archiso_tail.cfg diff --git a/syslinux/splash.png b/archiso/syslinux/splash.png similarity index 100% rename from syslinux/splash.png rename to archiso/syslinux/splash.png diff --git a/syslinux/syslinux.cfg b/archiso/syslinux/syslinux.cfg similarity index 100% rename from syslinux/syslinux.cfg rename to archiso/syslinux/syslinux.cfg diff --git a/build.sh b/build.sh index 54459bf..9e4ca26 100755 --- a/build.sh +++ b/build.sh @@ -2,6 +2,18 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -#printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2 -_buildsh_path="$(realpath -- "$0")" -exec mkarchiso "$@" "${_buildsh_path%/*}" +echo "################################################################## " +tput setaf 2 +echo "This file is kept here for continuity with the videos" +echo "We actually use the script in the folder installation-scripts" +echo "30 will first clean your cache and then build - downloads all packages" +echo "40 will reuse your cache and build - no download if you have the packages" +echo "Use the scripts in the folder installation-scripts instead" +echo "Do not run the scripts with sudo" +echo "But run it like this :" +echo "./30-build-the-iso-the-first-time.sh" +echo "or" +echo "./40-build-the-iso-local-again.sh" +echo "or else your iso will be in the /root folder" +tput sgr0 +echo "################################################################## " diff --git a/cleanup-v1.sh b/cleanup-v1.sh index e09ceae..5dd509c 100755 --- a/cleanup-v1.sh +++ b/cleanup-v1.sh @@ -1,23 +1,20 @@ -#!/bin/bash -#set -e -################################################################################################################## -# Author : Erik Dubois -# Website : https://www.erikdubois.be -# Website : https://www.arcolinux.info -# Website : https://www.arcolinux.com -# Website : https://www.arcolinuxd.com -# Website : https://www.arcolinuxforum.com -################################################################################################################## +#!/usr/bin/env bash # -# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. -# -################################################################################################################## -# change into your name and email. +# SPDX-License-Identifier: GPL-3.0-or-later -sudo rm -r out/ -sudo rm -r work/ - - -echo "################################################################" -echo "################### T H E E N D ######################" -echo "################################################################" +echo "################################################################## " +tput setaf 2 +echo "This file is kept here for continuity with the videos" +echo "We actually use the script in the folder installation-scripts" +echo "30 will first clean your cache and then build - downloads all packages" +echo "40 will reuse your cache and build - no download if you have the packages" +echo "Use the scripts in the folder installation-scripts instead" +echo "Do not run the scripts with sudo" +echo "But run it like this :" +echo "./30-build-the-iso-the-first-time.sh" +echo "or" +echo "./40-build-the-iso-local-again.sh" +echo "or else your iso will be in the /root folder" +echo "The clean up is done in the scripts." +tput sgr0 +echo "################################################################## " diff --git a/git-v2.sh b/git-v2.sh index 1e66ba3..1ff0bc7 100755 --- a/git-v2.sh +++ b/git-v2.sh @@ -16,6 +16,8 @@ # git commit --amend -m "more info" # git push --force origin +echo "Deleting the work folder if one exists" +[ -d work ] && rm -rf work # checking if I have the latest files from github echo "Checking for newer files online first" diff --git a/installation-scripts/30-build-the-iso-the-first-time.sh b/installation-scripts/30-build-the-iso-the-first-time.sh new file mode 100755 index 0000000..6b65331 --- /dev/null +++ b/installation-scripts/30-build-the-iso-the-first-time.sh @@ -0,0 +1,306 @@ +#!/bin/bash +#set -e +################################################################################################################## +# Author : Erik Dubois +# Website : https://www.erikdubois.be +# Website : https://www.arcolinux.info +# Website : https://www.arcolinux.com +# Website : https://www.arcolinuxd.com +# Website : https://www.arcolinuxb.com +# Website : https://www.arcolinuxiso.com +# Website : https://www.arcolinuxforum.com +################################################################################################################## +# +# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. +# +################################################################################################################## +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 1 : " +echo "- Setting General parameters" +tput sgr0 +echo "################################################################## " +echo + + #Let us set the desktop" + #First letter of desktop is small letter + + #desktop="xfce" + #lightdmDesktop="xfce" + + #arcolinuxVersion='v21.03.1' + + #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' + + # setting of the general parameters + archisoRequiredVersion="archiso 50.1-1" + buildFolder=$HOME"/alci-build" + outFolder=$HOME"/Alci-Out" + archisoVersion=$(sudo pacman -Q archiso) + + echo "################################################################## " + #echo "Building the desktop : "$desktop + #echo "Building version : "$arcolinuxVersion + #echo "Iso label : "$isoLabel + echo "Do you have the right archiso version? : "$archisoVersion + echo "What is the required archiso version? : "$archisoRequiredVersion + echo "Build folder : "$buildFolder + echo "Out folder : "$outFolder + echo "################################################################## " + + if [ "$archisoVersion" == "$archisoRequiredVersion" ]; then + tput setaf 2 + echo "##################################################################" + echo "Archiso has the correct version. Continuing ..." + echo "##################################################################" + tput sgr0 + else + tput setaf 1 + echo "###################################################################################################" + echo "You need to install the correct version of Archiso" + echo "Use 'sudo downgrade archiso' to do that" + echo "or update your system" + echo "###################################################################################################" + tput sgr0 + exit 1 + fi + +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 2 :" +echo "- Checking if archiso is installed" +echo "- Saving current archiso version to readme" +echo "- Making mkarchiso verbose" +tput sgr0 +echo "################################################################## " +echo + + package="archiso" + + #---------------------------------------------------------------------------------- + + #checking if application is already installed or else install with aur helpers + if pacman -Qi $package &> /dev/null; then + + echo "Archiso is already installed" + + else + + #checking which helper is installed + if pacman -Qi yay &> /dev/null; then + + echo "################################################################" + echo "######### Installing with yay" + echo "################################################################" + yay -S --noconfirm $package + + elif pacman -Qi trizen &> /dev/null; then + + echo "################################################################" + echo "######### Installing with trizen" + echo "################################################################" + trizen -S --noconfirm --needed --noedit $package + + fi + + # Just checking if installation was successful + if pacman -Qi $package &> /dev/null; then + + echo "################################################################" + echo "######### "$package" has been installed" + echo "################################################################" + + else + + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "!!!!!!!!! "$package" has NOT been installed" + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + exit 1 + fi + + fi + + echo + echo "Saving current archiso version to readme" + sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" ../archiso.readme + echo + echo "Making mkarchiso verbose" + sudo sed -i 's/quiet="y"/quiet="n"/g' /usr/bin/mkarchiso + +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 3 :" +echo "- Deleting the build folder if one exists" +echo "- Copying the Archiso folder to build folder" +tput sgr0 +echo "################################################################## " +echo + + echo "Deleting the build folder if one exists - takes some time" + [ -d $buildFolder ] && sudo rm -rf $buildFolder + echo + echo "Copying the Archiso folder to build work" + echo + mkdir $buildFolder + cp -r ../archiso $buildFolder/archiso + +# echo +# echo "################################################################## " +# tput setaf 2 +# echo "Phase 4 :" +# echo "- Deleting any files in /etc/skel" +# echo "- Getting the last version of bashrc in /etc/skel" +# echo "- Removing the old packages.x86_64 file from build folder" +# echo "- Copying the new packages.x86_64 file to the build folder" +# echo "- Changing group for polkit folder" +# tput sgr0 +# echo "################################################################## " +# echo + +# echo "Deleting any files in /etc/skel" +# rm -rf $buildFolder/archiso/airootfs/etc/skel/.* 2> /dev/null +# echo + +# echo "Getting the last version of bashrc in /etc/skel" +# echo +# wget https://raw.githubusercontent.com/arcolinux/arcolinux-root/master/etc/skel/.bashrc-latest -O $buildFolder/archiso/airootfs/etc/skel/.bashrc + +# echo "Removing the old packages.x86_64 file from build folder" +# rm $buildFolder/archiso/packages.x86_64 +# echo +# echo "Copying the new packages.x86_64 file to the build folder" +# cp -f ../archiso/packages.x86_64 $buildFolder/archiso/packages.x86_64 +# echo +# echo "Changing group for polkit folder" +# sudo chgrp polkitd $buildFolder/archiso/airootfs/etc/polkit-1/rules.d +# #is not working so fixing this during calamares installation + +# echo +# echo "################################################################## " +# tput setaf 2 +# echo "Phase 5 : " +# echo "- Changing all references" +# echo "- Adding time to /etc/dev-rel" +# tput sgr0 +# echo "################################################################## " +# echo +# +# #Setting variables +# +# #profiledef.sh +# oldname1='iso_name=arcolinux' +# newname1='iso_name=arcolinux' +# +# oldname2='iso_label="arcolinux' +# newname2='iso_label="arcolinux' +# +# oldname3='ArcoLinux' +# newname3='ArcoLinux' +# +# #hostname +# oldname4='ArcoLinux' +# newname4='ArcoLinux' +# +# #lightdm.conf user-session +# oldname5='user-session=xfce' +# newname5='user-session='$lightdmDesktop +# +# #lightdm.conf autologin-session +# oldname6='#autologin-session=' +# newname6='autologin-session='$lightdmDesktop +# +# echo "Changing all references" +# echo +# sed -i 's/'$oldname1'/'$newname1'/g' $buildFolder/archiso/profiledef.sh +# sed -i 's/'$oldname2'/'$newname2'/g' $buildFolder/archiso/profiledef.sh +# sed -i 's/'$oldname3'/'$newname3'/g' $buildFolder/archiso/airootfs/etc/dev-rel +# sed -i 's/'$oldname4'/'$newname4'/g' $buildFolder/archiso/airootfs/etc/hostname +# sed -i 's/'$oldname5'/'$newname5'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf +# sed -i 's/'$oldname6'/'$newname6'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf +# +# echo "Adding time to /etc/dev-rel" +# date_build=$(date -d now) +# echo "Iso build on : "$date_build +# sudo sed -i "s/\(^ISO_BUILD=\).*/\1$date_build/" $buildFolder/archiso/airootfs/etc/dev-rel + + +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 6 :" +echo "- Cleaning the cache from /var/cache/pacman/pkg/" +tput sgr0 +echo "################################################################## " +echo + + echo "Cleaning the cache from /var/cache/pacman/pkg/" + yes | sudo pacman -Scc + +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 7 :" +echo "- Building the iso - this can take a while - be patient" +tput sgr0 +echo "################################################################## " +echo + + [ -d $outFolder ] || mkdir $outFolder + cd $buildFolder/archiso/ + sudo mkarchiso -v -w $buildFolder -o $outFolder $buildFolder/archiso/ + + + +# echo +# echo "###################################################################" +# tput setaf 2 +# echo "Phase 8 :" +# echo "- Creating checksums" +# echo "- Copying pgklist" +# tput sgr0 +# echo "###################################################################" +# echo +# +# cd $outFolder +# +# echo "Creating checksums for : "$isoLabel +# echo "##################################################################" +# echo +# echo "Building sha1sum" +# echo "########################" +# sha1sum $isoLabel | tee $isoLabel.sha1 +# echo "Building sha256sum" +# echo "########################" +# sha256sum $isoLabel | tee $isoLabel.sha256 +# echo "Building md5sum" +# echo "########################" +# md5sum $isoLabel | tee $isoLabel.md5 +# echo +# echo "Moving pkglist.x86_64.txt" +# echo "########################" +# cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/$isoLabel".pkglist.txt" +# + +echo +echo "##################################################################" +tput setaf 2 +echo "Phase 9 :" +echo "- Making sure we start with a clean slate next time" +tput sgr0 +echo "################################################################## " +echo + + #echo "Deleting the build folder if one exists - takes some time" + #[ -d $buildFolder ] && sudo rm -rf $buildFolder + +echo +echo "##################################################################" +tput setaf 2 +echo "DONE" +echo "- Check your out folder :"$outFolder +tput sgr0 +echo "################################################################## " +echo diff --git a/installation-scripts/40-build-the-iso-local-again.sh b/installation-scripts/40-build-the-iso-local-again.sh new file mode 100755 index 0000000..f39d854 --- /dev/null +++ b/installation-scripts/40-build-the-iso-local-again.sh @@ -0,0 +1,306 @@ +#!/bin/bash +#set -e +################################################################################################################## +# Author : Erik Dubois +# Website : https://www.erikdubois.be +# Website : https://www.arcolinux.info +# Website : https://www.arcolinux.com +# Website : https://www.arcolinuxd.com +# Website : https://www.arcolinuxb.com +# Website : https://www.arcolinuxiso.com +# Website : https://www.arcolinuxforum.com +################################################################################################################## +# +# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. +# +################################################################################################################## +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 1 : " +echo "- Setting General parameters" +tput sgr0 +echo "################################################################## " +echo + + #Let us set the desktop" + #First letter of desktop is small letter + + #desktop="xfce" + #lightdmDesktop="xfce" + + #arcolinuxVersion='v21.03.1' + + #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' + + # setting of the general parameters + archisoRequiredVersion="archiso 50.1-1" + buildFolder=$HOME"/alci-build" + outFolder=$HOME"/Alci-Out" + archisoVersion=$(sudo pacman -Q archiso) + + echo "################################################################## " + #echo "Building the desktop : "$desktop + #echo "Building version : "$arcolinuxVersion + #echo "Iso label : "$isoLabel + echo "Do you have the right archiso version? : "$archisoVersion + echo "What is the required archiso version? : "$archisoRequiredVersion + echo "Build folder : "$buildFolder + echo "Out folder : "$outFolder + echo "################################################################## " + + if [ "$archisoVersion" == "$archisoRequiredVersion" ]; then + tput setaf 2 + echo "##################################################################" + echo "Archiso has the correct version. Continuing ..." + echo "##################################################################" + tput sgr0 + else + tput setaf 1 + echo "###################################################################################################" + echo "You need to install the correct version of Archiso" + echo "Use 'sudo downgrade archiso' to do that" + echo "or update your system" + echo "###################################################################################################" + tput sgr0 + exit 1 + fi + +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 2 :" +echo "- Checking if archiso is installed" +echo "- Saving current archiso version to readme" +echo "- Making mkarchiso verbose" +tput sgr0 +echo "################################################################## " +echo + + package="archiso" + + #---------------------------------------------------------------------------------- + + #checking if application is already installed or else install with aur helpers + if pacman -Qi $package &> /dev/null; then + + echo "Archiso is already installed" + + else + + #checking which helper is installed + if pacman -Qi yay &> /dev/null; then + + echo "################################################################" + echo "######### Installing with yay" + echo "################################################################" + yay -S --noconfirm $package + + elif pacman -Qi trizen &> /dev/null; then + + echo "################################################################" + echo "######### Installing with trizen" + echo "################################################################" + trizen -S --noconfirm --needed --noedit $package + + fi + + # Just checking if installation was successful + if pacman -Qi $package &> /dev/null; then + + echo "################################################################" + echo "######### "$package" has been installed" + echo "################################################################" + + else + + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "!!!!!!!!! "$package" has NOT been installed" + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + exit 1 + fi + + fi + + echo + echo "Saving current archiso version to readme" + sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" ../archiso.readme + echo + echo "Making mkarchiso verbose" + sudo sed -i 's/quiet="y"/quiet="n"/g' /usr/bin/mkarchiso + +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 3 :" +echo "- Deleting the build folder if one exists" +echo "- Copying the Archiso folder to build folder" +tput sgr0 +echo "################################################################## " +echo + + echo "Deleting the build folder if one exists - takes some time" + [ -d $buildFolder ] && sudo rm -rf $buildFolder + echo + echo "Copying the Archiso folder to build work" + echo + mkdir $buildFolder + cp -r ../archiso $buildFolder/archiso + +# echo +# echo "################################################################## " +# tput setaf 2 +# echo "Phase 4 :" +# echo "- Deleting any files in /etc/skel" +# echo "- Getting the last version of bashrc in /etc/skel" +# echo "- Removing the old packages.x86_64 file from build folder" +# echo "- Copying the new packages.x86_64 file to the build folder" +# echo "- Changing group for polkit folder" +# tput sgr0 +# echo "################################################################## " +# echo + +# echo "Deleting any files in /etc/skel" +# rm -rf $buildFolder/archiso/airootfs/etc/skel/.* 2> /dev/null +# echo + +# echo "Getting the last version of bashrc in /etc/skel" +# echo +# wget https://raw.githubusercontent.com/arcolinux/arcolinux-root/master/etc/skel/.bashrc-latest -O $buildFolder/archiso/airootfs/etc/skel/.bashrc + +# echo "Removing the old packages.x86_64 file from build folder" +# rm $buildFolder/archiso/packages.x86_64 +# echo +# echo "Copying the new packages.x86_64 file to the build folder" +# cp -f ../archiso/packages.x86_64 $buildFolder/archiso/packages.x86_64 +# echo +# echo "Changing group for polkit folder" +# sudo chgrp polkitd $buildFolder/archiso/airootfs/etc/polkit-1/rules.d +# #is not working so fixing this during calamares installation + +# echo +# echo "################################################################## " +# tput setaf 2 +# echo "Phase 5 : " +# echo "- Changing all references" +# echo "- Adding time to /etc/dev-rel" +# tput sgr0 +# echo "################################################################## " +# echo +# +# #Setting variables +# +# #profiledef.sh +# oldname1='iso_name=arcolinux' +# newname1='iso_name=arcolinux' +# +# oldname2='iso_label="arcolinux' +# newname2='iso_label="arcolinux' +# +# oldname3='ArcoLinux' +# newname3='ArcoLinux' +# +# #hostname +# oldname4='ArcoLinux' +# newname4='ArcoLinux' +# +# #lightdm.conf user-session +# oldname5='user-session=xfce' +# newname5='user-session='$lightdmDesktop +# +# #lightdm.conf autologin-session +# oldname6='#autologin-session=' +# newname6='autologin-session='$lightdmDesktop +# +# echo "Changing all references" +# echo +# sed -i 's/'$oldname1'/'$newname1'/g' $buildFolder/archiso/profiledef.sh +# sed -i 's/'$oldname2'/'$newname2'/g' $buildFolder/archiso/profiledef.sh +# sed -i 's/'$oldname3'/'$newname3'/g' $buildFolder/archiso/airootfs/etc/dev-rel +# sed -i 's/'$oldname4'/'$newname4'/g' $buildFolder/archiso/airootfs/etc/hostname +# sed -i 's/'$oldname5'/'$newname5'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf +# sed -i 's/'$oldname6'/'$newname6'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf +# +# echo "Adding time to /etc/dev-rel" +# date_build=$(date -d now) +# echo "Iso build on : "$date_build +# sudo sed -i "s/\(^ISO_BUILD=\).*/\1$date_build/" $buildFolder/archiso/airootfs/etc/dev-rel + + +#echo +#echo "################################################################## " +#tput setaf 2 +#echo "Phase 6 :" +#echo "- Cleaning the cache from /var/cache/pacman/pkg/" +#tput sgr0 +#echo "################################################################## " +#echo + + #echo "Cleaning the cache from /var/cache/pacman/pkg/" + #yes | sudo pacman -Scc + +echo +echo "################################################################## " +tput setaf 2 +echo "Phase 7 :" +echo "- Building the iso - this can take a while - be patient" +tput sgr0 +echo "################################################################## " +echo + + [ -d $outFolder ] || mkdir $outFolder + cd $buildFolder/archiso/ + sudo mkarchiso -v -w $buildFolder -o $outFolder $buildFolder/archiso/ + + + +# echo +# echo "###################################################################" +# tput setaf 2 +# echo "Phase 8 :" +# echo "- Creating checksums" +# echo "- Copying pgklist" +# tput sgr0 +# echo "###################################################################" +# echo +# +# cd $outFolder +# +# echo "Creating checksums for : "$isoLabel +# echo "##################################################################" +# echo +# echo "Building sha1sum" +# echo "########################" +# sha1sum $isoLabel | tee $isoLabel.sha1 +# echo "Building sha256sum" +# echo "########################" +# sha256sum $isoLabel | tee $isoLabel.sha256 +# echo "Building md5sum" +# echo "########################" +# md5sum $isoLabel | tee $isoLabel.md5 +# echo +# echo "Moving pkglist.x86_64.txt" +# echo "########################" +# cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/$isoLabel".pkglist.txt" +# + +#echo +#echo "##################################################################" +#tput setaf 2 +#echo "Phase 9 :" +#echo "- Making sure we start with a clean slate next time" +#tput sgr0 +#echo "################################################################## " +#echo + + #echo "Deleting the build folder if one exists - takes some time" + #[ -d $buildFolder ] && sudo rm -rf $buildFolder + +echo +echo "##################################################################" +tput setaf 2 +echo "DONE" +echo "- Check your out folder :"$outFolder +tput sgr0 +echo "################################################################## " +echo