From 211d2f972dd1480573d588e2c6770ac5303964b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 10 Nov 2024 14:05:08 +0100 Subject: [PATCH] Rename src/partition to src/repart --- meson.build | 2 +- .../definitions/confext.repart.d/10-root.conf | 0 .../confext.repart.d/20-root-verity.conf | 0 .../confext.repart.d/30-root-verity-sig.conf | 0 .../definitions/portable.repart.d/10-root.conf | 0 .../portable.repart.d/20-root-verity.conf | 0 .../portable.repart.d/30-root-verity-sig.conf | 0 .../definitions/sysext.repart.d/10-root.conf | 0 .../sysext.repart.d/20-root-verity.conf | 0 .../sysext.repart.d/30-root-verity-sig.conf | 0 src/{partition => repart}/meson.build | 16 ++++++++-------- src/{partition => repart}/repart.c | 0 12 files changed, 9 insertions(+), 9 deletions(-) rename src/{partition => repart}/definitions/confext.repart.d/10-root.conf (100%) rename src/{partition => repart}/definitions/confext.repart.d/20-root-verity.conf (100%) rename src/{partition => repart}/definitions/confext.repart.d/30-root-verity-sig.conf (100%) rename src/{partition => repart}/definitions/portable.repart.d/10-root.conf (100%) rename src/{partition => repart}/definitions/portable.repart.d/20-root-verity.conf (100%) rename src/{partition => repart}/definitions/portable.repart.d/30-root-verity-sig.conf (100%) rename src/{partition => repart}/definitions/sysext.repart.d/10-root.conf (100%) rename src/{partition => repart}/definitions/sysext.repart.d/20-root-verity.conf (100%) rename src/{partition => repart}/definitions/sysext.repart.d/30-root-verity-sig.conf (100%) rename src/{partition => repart}/meson.build (78%) rename src/{partition => repart}/repart.c (100%) diff --git a/meson.build b/meson.build index 32c192965c4..c7b7399d7ec 100644 --- a/meson.build +++ b/meson.build @@ -2395,7 +2395,6 @@ subdir('src/nss-mymachines') subdir('src/nss-resolve') subdir('src/nss-systemd') subdir('src/oom') -subdir('src/partition') subdir('src/path') subdir('src/pcrextend') subdir('src/pcrlock') @@ -2405,6 +2404,7 @@ subdir('src/quotacheck') subdir('src/random-seed') subdir('src/rc-local-generator') subdir('src/remount-fs') +subdir('src/repart') subdir('src/reply-password') subdir('src/resolve') subdir('src/rfkill') diff --git a/src/partition/definitions/confext.repart.d/10-root.conf b/src/repart/definitions/confext.repart.d/10-root.conf similarity index 100% rename from src/partition/definitions/confext.repart.d/10-root.conf rename to src/repart/definitions/confext.repart.d/10-root.conf diff --git a/src/partition/definitions/confext.repart.d/20-root-verity.conf b/src/repart/definitions/confext.repart.d/20-root-verity.conf similarity index 100% rename from src/partition/definitions/confext.repart.d/20-root-verity.conf rename to src/repart/definitions/confext.repart.d/20-root-verity.conf diff --git a/src/partition/definitions/confext.repart.d/30-root-verity-sig.conf b/src/repart/definitions/confext.repart.d/30-root-verity-sig.conf similarity index 100% rename from src/partition/definitions/confext.repart.d/30-root-verity-sig.conf rename to src/repart/definitions/confext.repart.d/30-root-verity-sig.conf diff --git a/src/partition/definitions/portable.repart.d/10-root.conf b/src/repart/definitions/portable.repart.d/10-root.conf similarity index 100% rename from src/partition/definitions/portable.repart.d/10-root.conf rename to src/repart/definitions/portable.repart.d/10-root.conf diff --git a/src/partition/definitions/portable.repart.d/20-root-verity.conf b/src/repart/definitions/portable.repart.d/20-root-verity.conf similarity index 100% rename from src/partition/definitions/portable.repart.d/20-root-verity.conf rename to src/repart/definitions/portable.repart.d/20-root-verity.conf diff --git a/src/partition/definitions/portable.repart.d/30-root-verity-sig.conf b/src/repart/definitions/portable.repart.d/30-root-verity-sig.conf similarity index 100% rename from src/partition/definitions/portable.repart.d/30-root-verity-sig.conf rename to src/repart/definitions/portable.repart.d/30-root-verity-sig.conf diff --git a/src/partition/definitions/sysext.repart.d/10-root.conf b/src/repart/definitions/sysext.repart.d/10-root.conf similarity index 100% rename from src/partition/definitions/sysext.repart.d/10-root.conf rename to src/repart/definitions/sysext.repart.d/10-root.conf diff --git a/src/partition/definitions/sysext.repart.d/20-root-verity.conf b/src/repart/definitions/sysext.repart.d/20-root-verity.conf similarity index 100% rename from src/partition/definitions/sysext.repart.d/20-root-verity.conf rename to src/repart/definitions/sysext.repart.d/20-root-verity.conf diff --git a/src/partition/definitions/sysext.repart.d/30-root-verity-sig.conf b/src/repart/definitions/sysext.repart.d/30-root-verity-sig.conf similarity index 100% rename from src/partition/definitions/sysext.repart.d/30-root-verity-sig.conf rename to src/repart/definitions/sysext.repart.d/30-root-verity-sig.conf diff --git a/src/partition/meson.build b/src/repart/meson.build similarity index 78% rename from src/partition/meson.build rename to src/repart/meson.build index 6920ef7ff08..bbf2584597e 100644 --- a/src/partition/meson.build +++ b/src/repart/meson.build @@ -41,13 +41,13 @@ executables += [ ] if conf.get('ENABLE_REPART') == 1 - install_data('definitions/confext.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'confext.repart.d') - install_data('definitions/confext.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'confext.repart.d') - install_data('definitions/confext.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'confext.repart.d') - install_data('definitions/portable.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'portable.repart.d') - install_data('definitions/portable.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'portable.repart.d') + install_data('definitions/confext.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'confext.repart.d') + install_data('definitions/confext.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'confext.repart.d') + install_data('definitions/confext.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'confext.repart.d') + install_data('definitions/portable.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'portable.repart.d') + install_data('definitions/portable.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'portable.repart.d') install_data('definitions/portable.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'portable.repart.d') - install_data('definitions/sysext.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d') - install_data('definitions/sysext.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d') - install_data('definitions/sysext.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d') + install_data('definitions/sysext.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d') + install_data('definitions/sysext.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d') + install_data('definitions/sysext.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d') endif diff --git a/src/partition/repart.c b/src/repart/repart.c similarity index 100% rename from src/partition/repart.c rename to src/repart/repart.c -- 2.47.3