]> git.ipfire.org Git - thirdparty/systemd.git/commit
projects / thirdparty / systemd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c2720fa) | patch
mkosi: Merge base and system images
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 27 Mar 2024 10:07:52 +0000 (11:07 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 27 Mar 2024 11:20:50 +0000 (12:20 +0100)
commit6327988d65a19ab2d8b9a5fb29116c8ff4c4a606
treea6d64e71e95df88f5c2e6463a991a2470864c2dbtree | snapshot
parentc2720fa55c0de0813c22edbecd5a220c83224a5acommit | diff
mkosi: Merge base and system images

The only reason to have these split up is to be able to build extension
images that use the base image as a base tree and install extra packages.
Until we have such a use case, let's merge the base and system images to
simplify things a bit.

We keep the mkosi.images/ directory to not cause too many conflicts with
the integration tests PR.
38 files changed:
mkosi.images/base/mkosi.conf [deleted file] blob | blame | history
mkosi.images/base/mkosi.conf.d/10-centos/mkosi.conf [deleted file] blob | blame | history
mkosi.images/system/mkosi.conf diff | blob | blame | history
mkosi.images/system/mkosi.conf.d/10-arch/initrd/mkosi.postinst [moved from mkosi.images/base/mkosi.conf.d/10-arch/initrd/mkosi.postinst with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot [moved from mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf [moved from mkosi.images/base/mkosi.conf.d/10-arch/mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare [moved from mkosi.images/base/mkosi.conf.d/10-arch/mkosi.prepare with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst [moved from mkosi.images/base/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot [moved from mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf [moved from mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.prepare [moved from mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.prepare with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf diff | blob | blame | history
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst [moved from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot [moved from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf [moved from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare [moved from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf [moved from mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf [moved from mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf [moved from mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf [moved from mkosi.images/base/mkosi.conf.d/10-fedora/mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst [moved from mkosi.images/base/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot [moved from mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.build.chroot with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf [moved from mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare [moved from mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.prepare with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf [moved from mkosi.images/base/mkosi.conf.d/10-ubuntu/mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/etc/issue [moved from mkosi.images/base/mkosi.extra/etc/issue with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf [moved from mkosi.images/base/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh [moved from mkosi.images/base/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset [moved from mkosi.images/base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset [moved from mkosi.images/base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service [moved from mkosi.images/base/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf [moved from mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/locale.conf [moved from mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb [moved from mkosi.images/base/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.finalize [moved from mkosi.images/base/mkosi.finalize with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.postinst [moved from mkosi.images/base/mkosi.postinst with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.postinst.chroot [moved from mkosi.images/base/mkosi.postinst.chroot with 100% similarity] blob | blame | history
mkosi.images/system/mkosi.sync [moved from mkosi.images/base/mkosi.sync with 100% similarity] blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.