diff options
| author | Richard Laager <[email protected]> | 2020-02-22 18:09:55 -0600 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2020-05-12 10:53:32 -0700 |
| commit | d7c076c793652a6fccd4aa4ff160d9ebbd7eb3e1 (patch) | |
| tree | 9ce46fce2e9157a362108a1bd5dffa4a42b41cf5 | |
| parent | e4185a03def329374d8def93c758da4842536fe2 (diff) | |
initramfs: Eliminate substitutions
These are now handled in zfs-functions, so this is all duplicative and
unnecessary.
Signed-off-by: Richard Laager <[email protected]>
| -rw-r--r-- | contrib/initramfs/scripts/Makefile.am | 18 | ||||
| -rw-r--r-- | contrib/initramfs/scripts/zfs (renamed from contrib/initramfs/scripts/zfs.in) | 10 |
2 files changed, 2 insertions, 26 deletions
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 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). |