From 415a89900f959f9b7f7dc6a755985276c23af7f1c3599097234fa62dd7aa1e7b Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 6 Jul 2022 14:55:56 +0000 Subject: [PATCH] Accepting request 987009 from home:favogt:combustion - Switch to use the git repo with obs_scm - Update to version 1.0+git0: * Add Makefile for make install support * Start sysroot-usr.mount as well * Replace invalid use of ln_r in module-setup.sh OBS-URL: https://build.opensuse.org/request/show/987009 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/combustion?expand=0&rev=28 --- LICENSE | 339 ------------------------------------ README | 115 ------------ _service | 15 ++ _servicedata | 4 + combustion | 186 -------------------- combustion-1.0+git0.obscpio | 3 + combustion-prepare.service | 32 ---- combustion.changes | 9 + combustion.obsinfo | 4 + combustion.rules | 27 --- combustion.service | 35 ---- combustion.spec | 24 +-- module-setup.sh | 25 --- 13 files changed, 41 insertions(+), 777 deletions(-) delete mode 100644 LICENSE delete mode 100644 README create mode 100644 _service create mode 100644 _servicedata delete mode 100644 combustion create mode 100644 combustion-1.0+git0.obscpio delete mode 100644 combustion-prepare.service create mode 100644 combustion.obsinfo delete mode 100644 combustion.rules delete mode 100644 combustion.service delete mode 100644 module-setup.sh diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 122a28c..0000000 --- a/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) 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 -this service 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 make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. 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. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. - - 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 -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision 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, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This 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. diff --git a/README b/README deleted file mode 100644 index 19c5d3c..0000000 --- a/README +++ /dev/null @@ -1,115 +0,0 @@ -Combustion - configure MicroOS on the first boot -================================================ - -Combustion is a minimal module for dracut, which runs a user provided script on -the first boot of a system. - -You can use this to create additional files, install packages, set up devices -or even re-partition the hard disk. The configuration can be provided as a -shell script, loaded from an external storage media and is run during boot in a -new system snapshot. On success, the system will directly boot into that new -snapshot, so that no reboot is needed. - -How to use it -------------- - -The configuration files are copied from a filesystem with the LABEL -"combustion", but to be compatible and co-installable with ignition -(https://github.com/coreos/ignition), the LABEL "ignition" is used as fallback. -It expects a directory "combustion" at the root level of the filesystem and -a file "script" inside, which is executed inside a transactional-update shell. - - - ├── combustion - │ ├── script - │ └── ... other files - └── ignition (optional) - └── config.ign - -If a QEMU fw_cfg blob with the name "opt/org.opensuse.combustion/script" is -found, it is preferred and the content of that is used as script. -Example parameter for QEMU: --fw_cfg name=opt/org.opensuse.combustion/script,file=/var/combustion-script - -You can do everything necessary for initial system configuration from this -script, including addition of ssh keys, adding users, changing passwords -or even doing partitioning changes. - -Simple example --------------- - -Example for formatting a USB drive and adding a config, which installs the -"vim-small" package and creates a /root/welcome file: - -``` -mkfs.ext4 /dev/sdX -e2label /dev/sdX ignition -mount /dev/sdX /mnt -mkdir -p /mnt/combustion/ -cat >/mnt/combustion/script </mnt/combustion/welcome -umount /mnt -``` - -The "# combustion: network" comment triggers networking initialization before -running the script. This is equivalent to passing "rd.neednet=1" on the kernel -cmdline and so the network configuration parameters (man dracut.cmdline) apply -here as well. If those aren't specified, it defaults to "ip=dhcp" for each -available interface. - -More complex configuration example ----------------------------------- - -This script additionally provides visible feedback during boot, sets a password -and copies a public ssh key (which has to be in the "combustion" folder). - -``` -#!/bin/bash -# combustion: network -# Redirect output to the console -exec > >(exec tee -a /dev/tty0) 2>&1 -# Set a password for root, generate the hash with "openssl passwd -6" -echo 'root:$5$.wn2BZHlEJ5R3B1C$TAHEchlU.h2tvfOpOki54NaHpGYKwdNhjaBuSpDotD7' | chpasswd -e -# Add a public ssh key and enable sshd -mkdir -pm700 /root/.ssh/ -cat id_rsa_new.pub >> /root/.ssh/authorized_keys -systemctl enable sshd.service -# Install vim-small -zypper --non-interactive install vim-small -# Leave a marker -echo "Configured with combustion" > /etc/issue.d/combustion -``` - -How it works ------------- - -The ignition-dracut-grub2 package created a flag file which tells GRUB 2 that -it's the first boot of the system and so GRUB adds "ignition.firstboot" to the -kernel commandline. - -If this option is found on the kernel cmdline, combustion.service's -ConditionKernelCommandLine is fulfilled and it'll be required by initrd.target. -This pulls in combustion-prepare.service, which runs after the config drive or -QEMU fw_cfg blob appears (see combustion.rules for details). It is read and if -the "network" flag comment is present, enables networking for later. -After /sysroot is mounted and network is up (if enabled), combustion.service -runs, which tries to activate all mountpoints in the system's /etc/fstab and -then calls transactional-update in a chroot. - -In this transactional-update session the script is started and the exit code -recorded. If the script failed, transactional-update rollback is called and -combustion.service marked as failed, which causes booting to fail. Note that a -missing config drive or script is not considered a fatal error and only results -in a warning. - -/sysroot is unmounted and mounted again, so that the default subvolume gets -reevaluated and directly booted into. - -The ignition-firstboot-complete service in the final system runs, which deletes -the flag file. This means that combustion is not run on subsequent boots. diff --git a/_service b/_service new file mode 100644 index 0000000..6a5614b --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://github.com/openSUSE/combustion.git + git + enable + @PARENT_TAG@+git@TAG_OFFSET@ + v(.*) + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..a11643f --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/combustion.git + 2a6a997198f3d56a7c72664365819bbb0f563904 \ No newline at end of file diff --git a/combustion b/combustion deleted file mode 100644 index 8af0419..0000000 --- a/combustion +++ /dev/null @@ -1,186 +0,0 @@ -#!/bin/bash -# SPDX-FileCopyrightText: 2020 SUSE LLC -# SPDX-License-Identifier: GPL-2.0-or-later -set -euo pipefail - -config_mount="/run/combustion/mount" - -if [ "${1-}" = "--prepare" ]; then - # Mount config drive - mkdir -p "${config_mount}" - - config_drive_found=0 - - # Try fw_cfg first - if [ -e "/sys/firmware/qemu_fw_cfg/by_name/opt/org.opensuse.combustion" ]; then - mkdir -p "${config_mount}/combustion" - if ! cp /sys/firmware/qemu_fw_cfg/by_name/opt/org.opensuse.combustion/script/raw \ - "${config_mount}/combustion/script"; then - echo "Failed to copy script from fw_cfg!" - exit 1 - fi - # TODO: Support other files, e.g. with a tarball or fs image? - - config_drive_found=1 - fi - - # Try disks next - both lower and upper case - for label in combustion COMBUSTION ignition IGNITION; do - [ "${config_drive_found}" = "1" ] && break - [ -e "/dev/disk/by-label/${label}" ] || continue - - if ! mount -o ro /dev/disk/by-label/${label} "${config_mount}"; then - echo "Failed to mount config drive!" - exit 1 - fi - - config_drive_found=1 - done - - if [ "${config_drive_found}" = "0" ]; then - echo "No config drive found" - exit 0 - fi - - # Check for the magic flag "# combustion: network" in the script - if [ -e "${config_mount}/combustion/script" ] \ - && grep -qE '^# combustion:(.*)\' "${config_mount}/combustion/script"; then - sh -s < /etc/cmdline.d/40-combustion-neednet.conf - if [ -e /lib/dracut/hooks/pre-udev/60-net-genrules.sh ]; then - # Wicked - . /lib/dracut/hooks/pre-udev/60-net-genrules.sh - # Re-trigger generation of network rules and apply them - udevadm control --reload - udevadm trigger --subsystem-match net --action add - else - # NetworkManager - . /usr/lib/dracut/hooks/cmdline/99-nm-config.sh - fi -EOF - fi - - exit 0 -fi - -# Use /dev/shm for data exchange -exchangedir="/dev/shm/combustion/" -delete_resolv_conf=0 - -cleanup() { - if findmnt "${config_mount}" >/dev/null; then - umount "${config_mount}" || true - rmdir "${config_mount}" || true - else - rm -rf "${config_mount}" || true - fi - - rm -rf "${exchangedir}" || true - - if [ "${delete_resolv_conf}" -eq 1 ]; then - rm -f /sysroot/etc/resolv.conf || true - fi - - # umount and remount so that the new default subvol is used - umount -R /sysroot - # Manual umount confuses systemd sometimes because it's async and the - # .mount unit might still be active when the "start" is queued, making - # it a noop, which ultimately leaves /sysroot unmounted - # (https://github.com/systemd/systemd/issues/20329). To avoid that, - # wait until systemd processed the umount events. In a chroot (or with - # SYSTEMD_OFFLINE=1) systemctl always succeeds, so avoid an infinite loop. - if ! systemctl --quiet is-active does-not-exist.mount; then - while systemctl --quiet is-active sysroot.mount; do sleep 0.5; done - fi - systemctl start sysroot.mount -} - -# Note: The /sysroot remounting during cleanup happens unconditionally. -# This is needed as ignition-mount.service's ExecStop is also disabled unconditionally. -trap cleanup EXIT - -if ! [ -d "${config_mount}/combustion" ]; then - echo "No config found - doing nothing." - exit 0 -fi - -# Make sure /sysroot is mounted -systemctl start sysroot.mount - -# Copy config -mkdir "${exchangedir}" -config_dir="${exchangedir}/config" -cp -R "${config_mount}/combustion" "${config_dir}" - -if ! [ -e "${config_dir}/script" ]; then - echo "No config script found." - exit 1 -fi - -# Have to take care of x-initrd.mount first and from the outside -awk '$4 ~ /x-initrd.mount/ { system("findmnt /sysroot" $2 " >/dev/null || mount -t " $3 " -o " $4 " " $1 " /sysroot" $2) }' /sysroot/etc/fstab - -# Make sure the old snapshot is relabeled too, otherwise syncing its /etc fails. -if [ -e /sysroot/etc/selinux/.autorelabel ]; then - NEWROOT=/sysroot bash -c '. /lib/dracut-lib.sh; . /lib/dracut/hooks/pre-pivot/50-selinux-microos-relabel.sh' -fi - -# Prepare chroot -for i in proc sys dev; do - mount --rbind /$i /sysroot/$i -done -mount --make-rslave /sysroot - -# Mount everything we can, errors deliberately ignored -chroot /sysroot mount -a || true -# t-u needs writable /var/run and /tmp -findmnt /sysroot/run >/dev/null || mount -t tmpfs tmpfs /sysroot/run -findmnt /sysroot/tmp >/dev/null || mount -t tmpfs tmpfs /sysroot/tmp - -# Fake a netconfig setup -if [ -r /etc/resolv.conf ]; then - mkdir -p /sysroot/run/netconfig/ - cp /etc/resolv.conf /sysroot/run/netconfig/resolv.conf - - if ! [ -e /sysroot/etc/resolv.conf ]; then - if ln -sf /run/netconfig/resolv.conf /sysroot/etc/resolv.conf; then - delete_resolv_conf=1 - fi - fi -fi - -if [ -x /sysroot/usr/sbin/transactional-update ]; then - # t-u doesn't allow running arbitrary commands and - # also ignores the shell's exit code, so DIY. - if ! chroot /sysroot transactional-update shell < "${exchangedir}/retval" - # Snapshot got touched while the policy isn't active, needs relabeling again. - [ -e /etc/selinux/.relabelled ] && >> /etc/selinux/.autorelabel -EOF - echo "transactional-update failed" - exit 1 - fi - - if ! [ -e "${exchangedir}/retval" ] || [ "$(cat "${exchangedir}/retval")" -ne 0 ]; then - echo "Command failed, rolling back" - chroot /sysroot transactional-update --no-selfupdate rollback - exit 1 - fi -else - mount -o remount,rw /sysroot - if ! chroot /sysroot sh -e -c "cd '${config_dir}'; chmod a+x script; ./script"; then - echo "Command failed" - exit 1 - fi - chroot /sysroot snapper --no-dbus create -d "After combustion configuration" || : -fi - -rm -f /sysroot/var/lib/YaST2/reconfig_system - -exit 0 diff --git a/combustion-1.0+git0.obscpio b/combustion-1.0+git0.obscpio new file mode 100644 index 0000000..2c8d3db --- /dev/null +++ b/combustion-1.0+git0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c4a77c64d9fbd44cd0ea6b864000852c0501326333956d00282dd8182a85a49 +size 35338 diff --git a/combustion-prepare.service b/combustion-prepare.service deleted file mode 100644 index 0e4fad1..0000000 --- a/combustion-prepare.service +++ /dev/null @@ -1,32 +0,0 @@ -[Unit] -Description=Combustion (preparations) -DefaultDependencies=false - -# Systemd evaluates Requires/After before conditions, so this unit is pulled in -# even when combustion.service won't run. -ConditionKernelCommandLine=|ignition.firstboot -ConditionKernelCommandLine=|combustion.firstboot - -# Config drive has to be available -Wants=dev-combustion-config.device -After=dev-combustion-config.device - -# If both Ignition and Combustion are active make sure to run their -# configuration scripts sequentially, as both try to mount the configuration -# device -After=ignition-setup-user.service - -# This reconfigures networking, which runs during the initqueue (wicked) -# or has its own service (NM) -Before=dracut-initqueue.service nm-initrd.service - -Conflicts=initrd-switch-root.target umount.target -Conflicts=dracut-emergency.service emergency.service emergency.target - -# Without this it goes into an endless loop on failure -OnFailure=emergency.target -OnFailureJobMode=isolate - -[Service] -Type=oneshot -ExecStart=/usr/bin/combustion --prepare diff --git a/combustion.changes b/combustion.changes index bb196ee..7a6ea62 100644 --- a/combustion.changes +++ b/combustion.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jul 06 09:34:01 UTC 2022 - Fabian Vogt + +- Switch to use the git repo with obs_scm +- Update to version 1.0+git0: + * Add Makefile for make install support + * Start sysroot-usr.mount as well + * Replace invalid use of ln_r in module-setup.sh + ------------------------------------------------------------------- Thu Mar 24 09:40:34 UTC 2022 - Fabian Vogt diff --git a/combustion.obsinfo b/combustion.obsinfo new file mode 100644 index 0000000..86fe3ee --- /dev/null +++ b/combustion.obsinfo @@ -0,0 +1,4 @@ +name: combustion +version: 1.0+git0 +mtime: 1657099713 +commit: 2a6a997198f3d56a7c72664365819bbb0f563904 diff --git a/combustion.rules b/combustion.rules deleted file mode 100644 index f823b9e..0000000 --- a/combustion.rules +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-FileCopyrightText: 2020 SUSE LLC -# SPDX-License-Identifier: GPL-2.0-or-later - -# These rules are needed to work around two systemd limitations: -# - It's not possible to wait for one of multiple devices to appear -# - ConditionKernelCommandLine is evaluated after Wants/After, -# so it waits for the devices unnecessarily -# Introduce a dev-combustion-config.device unit as alias to the actual device(s). -# This is only used for the .service dependencies. - -# Filesystems with either combustion or ignition as label -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="combustion", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="ignition", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" -# QEMU fw_cfg blob with key opt/org.opensuse.combustion -ACTION=="add", SUBSYSTEM=="opt", ENV{DEVPATH}=="/firmware/qemu_fw_cfg/by_name/opt/org.opensuse.combustion", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config", TAG+="systemd" - -# If combustion won't run, alias it to /dev/null to avoid waiting -ACTION=="add", SUBSYSTEM=="mem", ENV{DEVPATH}=="/devices/virtual/mem/null", GOTO="combustion_dev_null" -GOTO="combustion_end" - -LABEL="combustion_dev_null" -# IMPORT has to be on its own as it returns success or not, even with "="... -IMPORT{cmdline}="ignition.firstboot" -IMPORT{cmdline}="combustion.firstboot" -ENV{ignition.firstboot}!="1", ENV{combustion.firstboot}!="1", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config", TAG+="systemd" - -LABEL="combustion_end" diff --git a/combustion.service b/combustion.service deleted file mode 100644 index d69426a..0000000 --- a/combustion.service +++ /dev/null @@ -1,35 +0,0 @@ -[Unit] -Description=Combustion -DefaultDependencies=false - -ConditionKernelCommandLine=|ignition.firstboot -ConditionKernelCommandLine=|combustion.firstboot - -# /sysroot needs to be available, but it's temporarily stopped -# for remounting so a direct requirement is not possible -Requires=initrd-root-device.target -After=initrd-root-device.target - -# combustion-prepare sets up network, if required -Requires=combustion-prepare.service -After=combustion-prepare.service - -# Optionally make network available -After=network.target - -# After ignition completed its stuff -After=ignition-complete.target - -# So that /etc/fstab's x-initrd.mount entries are read (again) later -Before=initrd-parse-etc.service - -Conflicts=initrd-switch-root.target umount.target -Conflicts=dracut-emergency.service emergency.service emergency.target - -# Without this it goes into an endless loop on failure -OnFailure=emergency.target -OnFailureJobMode=isolate - -[Service] -Type=oneshot -ExecStart=/usr/bin/combustion diff --git a/combustion.spec b/combustion.spec index d4d961d..ba0f0da 100644 --- a/combustion.spec +++ b/combustion.spec @@ -17,19 +17,13 @@ Name: combustion -Version: 0.3 +Version: 1.0+git0 Release: 0 Summary: System for initial configuration of appliances License: GPL-2.0-or-later Group: System/Management -URL: https://en.opensuse.org/Portal:MicroOS/Combustion -Source1: LICENSE -Source2: README -Source3: module-setup.sh -Source4: combustion.service -Source5: combustion-prepare.service -Source6: combustion -Source7: combustion.rules +URL: https://github.com/openSUSE/combustion +Source0: %{name}-%{version}.tar.xz Requires: ignition-dracut-grub2 BuildArch: noarch @@ -44,18 +38,12 @@ new system snapshot. On success, the system will directly boot into that new snapshot, so that no reboot is needed. %prep -cp %{SOURCE1} %{SOURCE2} . +%autosetup -p1 %build %install -mkdir -p %{buildroot}%{_prefix}/lib/dracut/modules.d/35combustion -cd %{buildroot}%{_prefix}/lib/dracut/modules.d/35combustion/ -install -m0644 %{SOURCE3} module-setup.sh -install -m0644 %{SOURCE4} combustion.service -install -m0644 %{SOURCE5} combustion-prepare.service -install -m0755 %{SOURCE6} combustion -install -m0644 %{SOURCE7} combustion.rules +%make_install %post %{?regenerate_initrd_post} @@ -65,7 +53,7 @@ install -m0644 %{SOURCE7} combustion.rules %files %license LICENSE -%doc README +%doc README.md %dir %{_prefix}/lib/dracut/ %dir %{_prefix}/lib/dracut/modules.d/ %{_prefix}/lib/dracut/modules.d/35combustion/ diff --git a/module-setup.sh b/module-setup.sh deleted file mode 100644 index c894a9a..0000000 --- a/module-setup.sh +++ /dev/null @@ -1,25 +0,0 @@ -depends() { - echo bash network systemd url-lib -} - -install() { - inst_simple "${moddir}/combustion.service" "${systemdsystemunitdir}/combustion.service" - inst_simple "${moddir}/combustion-prepare.service" "${systemdsystemunitdir}/combustion-prepare.service" - inst_simple "${moddir}/combustion.rules" "/etc/udev/rules.d/70-combustion.rules" - mkdir -p "${initdir}/${systemdsystemunitdir}/initrd.target.requires/" - ln_r "../combustion.service" "${systemdsystemunitdir}/initrd.target.requires/combustion.service" - inst_multiple awk chroot findmnt grep rmdir - inst_simple "${moddir}/combustion" "/usr/bin/combustion" - - # ignition-mount.service mounts stuff below /sysroot in ExecStart and umounts - # it on ExecStop, failing if umounting fails. This conflicts with the - # mounts/umounts done by combustion. Just let combustion do it instead. - mkdir -p "${initdir}/${systemdsystemunitdir}/ignition-mount.service.d/" - echo -e "[Service]\nExecStop=" > "${initdir}/${systemdsystemunitdir}/ignition-mount.service.d/noexecstop.conf" - - # Wait up to 10s (30s on aarch64) for the config drive - devtimeout=10 - [ "$(uname -m)" = "aarch64" ] && devtimeout=30 - mkdir -p "${initdir}/${systemdsystemunitdir}/dev-combustion-config.device.d/" - echo -e "[Unit]\nJobTimeoutSec=${devtimeout}" > "${initdir}/${systemdsystemunitdir}/dev-combustion-config.device.d/timeout.conf" -}