Merge branch 'equuleus' of github.com:vyos/vyatta-cfg-system into current

* 'equuleus' of github.com:vyos/vyatta-cfg-system:
  syslog: fixes 'Option value must be on or off' message
  T1743: do not generate ssh rsa1 host keys
  Jenkins: import Pipeline from vyos-1x commit 9b5867b7345e1
  install-image: T1718 - ISO check in /opt/vyatta/sbin/install-image faulty
  T1584: equuleus: buster: consistent grub options for live/installed image
  vlan: q-in-q: T1551: add missing if statement to check if vlan interface exists
  Restore the vyatta-biosdevname dependency.
  update Jenkins file for equuleus
  Remove dependency on apparently no longer used biosdevname.
  T1499: Allow for usage of systemd interface mappings (#103)
  Revert "Update jenkinsfile to equuleus"
  Update jenkinsfile to equuleus
  [mibs] remove duplicated SNMP mibs present in Debian Buster

3 files changed, 2 insertions, 6 deletions

diff --git a/scripts/install/install-image b/scripts/install/install-image
index 658a8a39..fecaeed8 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -154,7 +154,7 @@ set_up_new_iso ()
 	fi
     fi
 
-  if [ ! -f "$NEW_ISO" ] || ! (file $NEW_ISO | grep -q 9660); then
+  if [ ! -f "$NEW_ISO" ] || ! (grep -q ISO9660 $NEW_ISO); then
     fail_exit "\"$NEW_ISO\" is not a valid ISO image file."
   fi
 
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 48f90833..c220f49e 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -112,10 +112,6 @@ create_ssh_host_keys () {
 	syslog "Creating ssh v2 dsa host key."
         ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key
     fi;
-    if [ ! -f "/etc/ssh/ssh_host_key" ]; then
-	syslog "Creating ssh v1 host key."
-        ssh-keygen -q -N '' -t rsa1 -f /etc/ssh/ssh_host_key
-    fi;
     if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then
 	syslog "Creating ssh ed25519 host key."
         ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
index bc2c653c..97b408eb 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -103,7 +103,7 @@ else
 fi
 
 if eval "$UNION"; then
-    GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin vyos-union=/boot/$livedir"
+    GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/$livedir"
     union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \
                                  2>/dev/null \
                                | awk -F/ '{ print $6 }' \