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>
This commit is contained in:
parent
49afc91387
commit
01243e72a5
|
@ -1,22 +1,6 @@
|
||||||
scriptsdir = /usr/share/initramfs-tools/scripts
|
scriptsdir = /usr/share/initramfs-tools/scripts
|
||||||
|
|
||||||
scripts_DATA = \
|
dist_scripts_DATA = \
|
||||||
zfs
|
zfs
|
||||||
|
|
||||||
SUBDIRS = local-top
|
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)
|
|
||||||
|
|
|
@ -6,17 +6,9 @@
|
||||||
# Enable this by passing boot=zfs on the kernel command line.
|
# Enable this by passing boot=zfs on the kernel command line.
|
||||||
#
|
#
|
||||||
|
|
||||||
# Source the common init script
|
# Source the common functions
|
||||||
. /etc/zfs/zfs-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.
|
# Start interactive shell.
|
||||||
# Use debian's panic() if defined, because it allows to prevent shell access
|
# 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).
|
# by setting panic in cmdline (e.g. panic=0 or panic=15).
|
Loading…
Reference in New Issue