From d28948564d021736022c4e1eb456259fe3aa1eb3 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Thu, 15 Mar 2018 19:23:18 +0100 Subject: [PATCH] Remove sourcing /scripts/functions in components The components 9990-fstab.sh and 9990-netbase.sh source /scripts/functions. This overrides the mount_* functions (to no-ops) which will break supporting live-{top,premount,bottom} hooks. Therefore remove those problematic includes which do not seem to be necessary nowadays. See Debian bug #884355 for the discussion. Signed-off-by: Benjamin Drung --- components/9990-fstab.sh | 4 ---- components/9990-netbase.sh | 4 ---- 2 files changed, 8 deletions(-) diff --git a/components/9990-fstab.sh b/components/9990-fstab.sh index a8d9123..ba579de 100755 --- a/components/9990-fstab.sh +++ b/components/9990-fstab.sh @@ -4,10 +4,6 @@ Fstab () { - # FIXME: stop hardcoding overloading of initramfs-tools functions - . /scripts/functions - . /lib/live/boot/9990-initramfs-tools.sh - if [ -n "${NOFSTAB}" ] then return diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh index 04a4ae4..bae858a 100755 --- a/components/9990-netbase.sh +++ b/components/9990-netbase.sh @@ -9,10 +9,6 @@ Netbase () return fi - # FIXME: stop hardcoding overloading of initramfs-tools functions - . /scripts/functions - . /lib/live/boot/9990-initramfs-tools.sh - log_begin_msg "Preconfiguring networking" IFFILE="/root/etc/network/interfaces" -- 2.1.4