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 <benjamin.drung@profitbricks.com>

diff --git a/components/9990-fstab.sh b/components/9990-fstab.sh
index a8d9123..ba579de 100755 (executable)
--- 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 (executable)
--- 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"