Rename src/partition to src/repart

diff --git a/meson.build b/meson.build
index 32c192965c4501f1b50cb679da5b6588c97a7d61..c7b7399d7ec315a73485ac57a22a09073b743c64 100644 (file)
--- 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 6920ef7ff0838993c939e88e039b312db2db6c80..bbf2584597ee5795eb174e316335e0ed42beee91 100644 (file)
--- 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