c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

initramfs: Eliminate substitutions

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

Signed-off-by: Richard Laager <rlaager@wiktel.com>
This commit is contained in:
Richard Laager 2020-02-22 18:09:55 -06:00 committed by Brian Behlendorf
parent 49afc91387
commit 01243e72a5
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/initramfs/scripts/Makefile.am
View File

@ -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)

10
contrib/initramfs/scripts/zfs.in → contrib/initramfs/scripts/zfs
View File

@ -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).