Skip to content

Commit

Permalink
initramfs: Eliminate substitutions
Browse files Browse the repository at this point in the history
These are now handled in zfs-functions, so this is all duplicative and
unnecessary.

Signed-off-by: Richard Laager <rlaager@wiktel.com>
  • Loading branch information
rlaager authored and behlendorf committed Mar 10, 2020
1 parent 49afc91 commit 01243e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
18 changes: 1 addition & 17 deletions contrib/initramfs/scripts/Makefile.am
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down

0 comments on commit 01243e7

Please sign in to comment.