From 0758b396d570b2ad4397ec35f5916515e8c223f9 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Thu, 15 Aug 2019 16:33:39 -0500
Subject: T1584: equuleus: buster: consistent grub options for live/installed
 image

---
 scripts/vyatta-grub-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

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 }' \
-- 
cgit v1.2.3


From 4b3434f8fab3201e7483bff95af71b7a1f51a13c Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Tue, 8 Oct 2019 13:38:15 -0700
Subject: install-image: T1718 - ISO check in /opt/vyatta/sbin/install-image
 faulty

---
 scripts/install/install-image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/install/install-image b/scripts/install/install-image
index dbdd5901..ac4d2dec 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -150,7 +150,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
 
-- 
cgit v1.2.3


From 9f1cc848d194d9b85d839ef847df5062d56941c2 Mon Sep 17 00:00:00 2001
From: jjakob <jernej.jakob@gmail.com>
Date: Sat, 19 Oct 2019 03:19:54 +0200
Subject: T1743: do not generate ssh rsa1 host keys

---
 debian/vyatta-cfg-system.postinst.in | 6 ------
 scripts/rl-system.init               | 4 ----
 2 files changed, 10 deletions(-)

(limited to 'scripts')

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 18e84055..708251b3 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -60,12 +60,6 @@ if [ "$sysconfdir" != "/etc" ]; then
     sed -i 's/^#PasswordAuthentication/PasswordAuthentication/' /etc/ssh/sshd_config
     sed -i '/^PasswordAuthentication/s/no/yes/' /etc/ssh/sshd_config
 
-    # add HostKeys for protocol version 1
-    if ! grep -q '^HostKey /etc/ssh/ssh_host_key' /etc/ssh/sshd_config; then
-	echo '# HostKey for protocol version 1' >> /etc/ssh/sshd_config
-	echo 'HostKey /etc/ssh/ssh_host_key' >> /etc/ssh/sshd_config
-    fi
-
     # add UseDNS line
     sed -i '/^UseDNS/d' /etc/ssh/sshd_config
     echo 'UseDNS yes' >>/etc/ssh/sshd_config
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 62eac9e7..0af72cd9 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
-- 
cgit v1.2.3