diff options
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | src/repart/definitions/confext.repart.d/10-root.conf (renamed from src/partition/definitions/confext.repart.d/10-root.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/confext.repart.d/20-root-verity.conf (renamed from src/partition/definitions/confext.repart.d/20-root-verity.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/confext.repart.d/30-root-verity-sig.conf (renamed from src/partition/definitions/confext.repart.d/30-root-verity-sig.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/portable.repart.d/10-root.conf (renamed from src/partition/definitions/portable.repart.d/10-root.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/portable.repart.d/20-root-verity.conf (renamed from src/partition/definitions/portable.repart.d/20-root-verity.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/portable.repart.d/30-root-verity-sig.conf (renamed from src/partition/definitions/portable.repart.d/30-root-verity-sig.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/sysext.repart.d/10-root.conf (renamed from src/partition/definitions/sysext.repart.d/10-root.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/sysext.repart.d/20-root-verity.conf (renamed from src/partition/definitions/sysext.repart.d/20-root-verity.conf) | 0 | ||||
-rw-r--r-- | src/repart/definitions/sysext.repart.d/30-root-verity-sig.conf (renamed from src/partition/definitions/sysext.repart.d/30-root-verity-sig.conf) | 0 | ||||
-rw-r--r-- | src/repart/meson.build (renamed from src/partition/meson.build) | 16 | ||||
-rw-r--r-- | src/repart/repart.c (renamed from src/partition/repart.c) | 0 |
12 files changed, 9 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 32c192965c..c7b7399d7e 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 index f728ab66d5..f728ab66d5 100644 --- a/src/partition/definitions/confext.repart.d/10-root.conf +++ b/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 index 8179351b6c..8179351b6c 100644 --- a/src/partition/definitions/confext.repart.d/20-root-verity.conf +++ b/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 index df160154a7..df160154a7 100644 --- a/src/partition/definitions/confext.repart.d/30-root-verity-sig.conf +++ b/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 index 6f500d04d8..6f500d04d8 100644 --- a/src/partition/definitions/portable.repart.d/10-root.conf +++ b/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 index 8179351b6c..8179351b6c 100644 --- a/src/partition/definitions/portable.repart.d/20-root-verity.conf +++ b/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 index df160154a7..df160154a7 100644 --- a/src/partition/definitions/portable.repart.d/30-root-verity-sig.conf +++ b/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 index b8ef985b92..b8ef985b92 100644 --- a/src/partition/definitions/sysext.repart.d/10-root.conf +++ b/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 index 8179351b6c..8179351b6c 100644 --- a/src/partition/definitions/sysext.repart.d/20-root-verity.conf +++ b/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 index df160154a7..df160154a7 100644 --- a/src/partition/definitions/sysext.repart.d/30-root-verity-sig.conf +++ b/src/repart/definitions/sysext.repart.d/30-root-verity-sig.conf diff --git a/src/partition/meson.build b/src/repart/meson.build index 6920ef7ff0..bbf2584597 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 index 7e6fd2a29a..7e6fd2a29a 100644 --- a/src/partition/repart.c +++ b/src/repart/repart.c |