Merge branch 'current' of github.com:vyos/vyos-build into current

3 files changed, 8 insertions, 1 deletions

diff --git a/data/live-build-config/hooks/04-locale.chroot b/data/live-build-config/hooks/04-locale.chroot
index 1c02db02..89a5f954 100755
--- a/data/live-build-config/hooks/04-locale.chroot
+++ b/data/live-build-config/hooks/04-locale.chroot
@@ -6,3 +6,4 @@ LANG=en_US.UTF-8
 LC_ALL=C
 EOF
 
+sed -i 's/AcceptEnv LANG LC_\*/# AcceptEnv LANG LC_\*/g' /etc/ssh/sshd_config
diff --git a/data/live-build-config/hooks/09-live.chroot b/data/live-build-config/hooks/09-live.chroot
index e2f95ff3..f19f0ae6 100755
--- a/data/live-build-config/hooks/09-live.chroot
+++ b/data/live-build-config/hooks/09-live.chroot
@@ -1,6 +1,11 @@
 #!/bin/sh
 
 # hack live script that tries to mount ext[23] floppies as root
+# remove user settings live config scripts
 
 sed -e '/ln -s "${devname}"/,/return 0/ s/^/: FIXME/' \
     -i /usr/share/initramfs-tools/scripts/live
+
+rm -rf /lib/live/config/0030-live-debconfig_passwd
+rm -rf /lib/live/config/0030-user-setup
+rm -rf /lib/live/config/0040-sudo
diff --git a/data/live-build-config/hooks/18-disable_services.chroot b/data/live-build-config/hooks/18-enable-disable_services.chroot
index c68a6b3d..68971405 100755
--- a/data/live-build-config/hooks/18-disable_services.chroot
+++ b/data/live-build-config/hooks/18-enable-disable_services.chroot
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo I: Disabling services.
+echo I: Enabling/Disabling services.
 systemctl disable exim4
 /usr/sbin/update-rc.d -f exim4 remove
 systemctl disable isc-dhcp-server
@@ -25,3 +25,4 @@ systemctl disable dnsmasq
 /usr/sbin/update-rc.d -f dnsmasq remove
 systemctl disable lldpd
 /usr/sbin/update-rc.d -f lldpd remove
+systemctl enable ssh-session-cleanup