T7836: move bind mount of /config to vyos-1x

We are removing the bind mount construction from the initrd components,
as:
(1) it is not needed before initialization in the vyos-1x vyos-router script
(2) does not correctly update inodes on libc rename
(3) fails on the livecd (cf. /var/log/live/boot.log)

2 files changed, 0 insertions, 34 deletions

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 2468112..30dc0c2 100755
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -194,8 +194,6 @@ Live ()
 
 	Swap
 
-	Vyos
-
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}
diff --git a/components/9990-vyos.sh b/components/9990-vyos.sh
deleted file mode 100755
index 77d974f..0000000
--- a/components/9990-vyos.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-Vyos ()
-{
-	# live-initramfs header
-	. /scripts/functions
-	. /lib/live/boot/9990-initramfs-tools.sh
-
-	log_begin_msg "Configuring VyOS config path"
-
-	# bind the vyatta config directory with the following precedence
-	#	1) backing store if present
-	#	2) create live/"overlay" which may or maynot be on a non-volatile device
-	#	   but is certainly read-write
-
-	VYOS_MOUNT_DIR="$(echo ${VYOS_MOUNT} | sed 's/live/mount/')"
-	unioncfgpath="$(trim_path /root/lib/live/${VYOS_MOUNT_DIR}/${PERSISTENCE_PATH}/rw)"
-
-	if [ -d /root/opt/vyatta/etc/config ]
-	then
-		if [ -d ${unioncfgpath}/config ]
-		then
-			mount -o bind ${unioncfgpath}/config /root/opt/vyatta/etc/config
-		else
-			cp -a /root/opt/vyatta/etc/config ${unioncfgpath} >/dev/null 2>&1
-			mount -o bind ${unioncfgpath}/config /root/opt/vyatta/etc/config
-		fi
-	fi
-	log_end_msg
-}