From 01243e72a5d7144345a9c13ab4455a52003fc0af Mon Sep 17 00:00:00 2001
From: Richard Laager <rlaager@wiktel.com>
Date: Sat, 22 Feb 2020 18:09:55 -0600
Subject: [PATCH] initramfs: Eliminate substitutions

These are now handled in zfs-functions, so this is all duplicative and
unnecessary.

Signed-off-by: Richard Laager <rlaager@wiktel.com>
---
 contrib/initramfs/scripts/Makefile.am     | 18 +-----------------
 contrib/initramfs/scripts/{zfs.in => zfs} | 10 +---------
 2 files changed, 2 insertions(+), 26 deletions(-)
 rename contrib/initramfs/scripts/{zfs.in => zfs} (99%)

diff --git a/contrib/initramfs/scripts/Makefile.am b/contrib/initramfs/scripts/Makefile.am
index 3ab18ba2c..2a142096e 100644
--- a/contrib/initramfs/scripts/Makefile.am
+++ b/contrib/initramfs/scripts/Makefile.am
@@ -1,22 +1,6 @@
 scriptsdir = /usr/share/initramfs-tools/scripts
 
-scripts_DATA = \
+dist_scripts_DATA = \
 	zfs
 
 SUBDIRS = local-top
-
-EXTRA_DIST = \
-	$(top_srcdir)/contrib/initramfs/scripts/zfs.in
-
-$(scripts_DATA):%:%.in
-	-$(SED) -e 's,@sbindir\@,$(sbindir),g' \
-		-e 's,@sysconfdir\@,$(sysconfdir),g' \
-		$< >'$@'
-
-# Double-colon rules are allowed; there are multiple independent definitions.
-clean-local::
-	-$(RM) $(scripts_SCRIPTS)
-
-# Double-colon rules are allowed; there are multiple independent definitions.
-distclean-local::
-	-$(RM) $(scripts_SCRIPTS)
diff --git a/contrib/initramfs/scripts/zfs.in b/contrib/initramfs/scripts/zfs
similarity index 99%
rename from contrib/initramfs/scripts/zfs.in
rename to contrib/initramfs/scripts/zfs
index 4bbdf53a7..dbc4e253f 100644
--- a/contrib/initramfs/scripts/zfs.in
+++ b/contrib/initramfs/scripts/zfs
@@ -6,17 +6,9 @@
 # Enable this by passing boot=zfs on the kernel command line.
 #
 
-# Source the common init script
+# Source the common functions
 . /etc/zfs/zfs-functions
 
-# Paths to what we need - in the initrd, these paths are hardcoded,
-# so override the defines in zfs-functions.
-ZFS="@sbindir@/zfs"
-ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
-export ZFS ZPOOL ZPOOL_CACHE
-
-
 # Start interactive shell.
 # Use debian's panic() if defined, because it allows to prevent shell access
 # by setting panic in cmdline (e.g. panic=0 or panic=15).