Move clevis-zfs-common to /usr/libexec

lowjoel · lowjoel · commit 59a2544e5916 · 2024-06-14T16:45:04.000+08:00
diff --git a/src/initramfs-tools/hooks/clevis-zfs.in b/src/initramfs-tools/hooks/clevis-zfs.in
@@ -53,7 +53,7 @@ copy_exec @bindir@/clevis-decrypt-tang || die 1 "@bindir@/clevis-decrypt-tang no
 copy_exec @bindir@/clevis-decrypt-sss || die 1 "@bindir@/clevis-decrypt-sss not found"
 copy_exec @bindir@/clevis-decrypt-null || die 1 "@bindir@/clevis-decrypt-null not found"
 copy_exec @bindir@/clevis-decrypt || die 1 "@bindir@/clevis-decrypt not found"
-copy_exec @bindir@/clevis-zfs-common || die 1 "@bindir@/clevis-zfs-common not found"
+copy_exec @libexecdir@/clevis-zfs-common || die 1 "@libexecdir@/clevis-zfs-common not found"
 copy_exec @bindir@/clevis-zfs-unlock || die 1 "@bindir@/clevis-zfs-unlock not found"
 if [ -x @bindir@/clevis-decrypt-tpm2 ]; then
     copy_exec @bindir@/clevis-decrypt-tpm2 || die 1 "@bindir@/clevis-decrypt-tpm2 not found"
diff --git a/src/zfs/clevis-zfs-bind b/src/zfs/clevis-zfs-bind
@@ -106,6 +106,6 @@ function main() {
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-	. clevis-zfs-common
+	. @libexecdir@/clevis-zfs-common
 	main "${@}"
 fi
diff --git a/src/zfs/clevis-zfs-list b/src/zfs/clevis-zfs-list
@@ -41,6 +41,6 @@ main() {
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-	. clevis-zfs-common
+	. @libexecdir@/clevis-zfs-common
 	main "${@}"
 fi
diff --git a/src/zfs/clevis-zfs-unbind b/src/zfs/clevis-zfs-unbind
@@ -81,6 +81,6 @@ function main() {
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-	. clevis-zfs-common
+	. @libexecdir@/clevis-zfs-common
 	main "${@}"
 fi
diff --git a/src/zfs/clevis-zfs-unlock b/src/zfs/clevis-zfs-unlock
@@ -81,6 +81,6 @@ function testing() {
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-	. clevis-zfs-common
+	. @libexecdir@/clevis-zfs-common
 	main "${@}"
 fi
diff --git a/src/zfs/meson.build b/src/zfs/meson.build
@@ -1,6 +1,21 @@
-bins += join_paths(meson.current_source_dir(), 'clevis-zfs-bind')
-bins += join_paths(meson.current_source_dir(), 'clevis-zfs-common')
-bins += join_paths(meson.current_source_dir(), 'clevis-zfs-list')
-bins += join_paths(meson.current_source_dir(), 'clevis-zfs-test')
-bins += join_paths(meson.current_source_dir(), 'clevis-zfs-unbind')
-bins += join_paths(meson.current_source_dir(), 'clevis-zfs-unlock')
+install_data(
+  [join_paths(meson.current_source_dir(), 'clevis-zfs-common')],
+  install_dir: libexecdir
+)
+
+zfs_bins = [
+  'clevis-zfs-bind',
+  'clevis-zfs-list',
+  'clevis-zfs-unbind',
+  'clevis-zfs-unlock',
+]
+foreach b : zfs_bins
+  configure_file(
+    input: b,
+    output: b,
+    install_dir: bindir,
+    configuration: data
+  )
+endforeach
+
+test('clevis-zfs-test', find_program(join_paths(meson.current_source_dir(), 'clevis-zfs-test')))

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,6 @@ function main() {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then`
`109`		`- . clevis-zfs-common`
	`109`	`+ . @libexecdir@/clevis-zfs-common`
`110`	`110`	`main "${@}"`
`111`	`111`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ main() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then`
`44`		`- . clevis-zfs-common`
	`44`	`+ . @libexecdir@/clevis-zfs-common`
`45`	`45`	`main "${@}"`
`46`	`46`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,6 @@ function main() {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then`
`84`		`- . clevis-zfs-common`
	`84`	`+ . @libexecdir@/clevis-zfs-common`
`85`	`85`	`main "${@}"`
`86`	`86`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,6 @@ function testing() {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then`
`84`		`- . clevis-zfs-common`
	`84`	`+ . @libexecdir@/clevis-zfs-common`
`85`	`85`	`main "${@}"`
`86`	`86`	`fi`