summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-19 17:09:34 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-19 17:09:34 +0200
commita7fac7399df70be83f1076115036abaad9e6424f (patch)
tree605a417aa2f40a2e0e61ea0e27e1daa22ed0eadc
parent5a1740044c45691df76ee7eca17e5854d252ac7a (diff)
downloadvyos-build-a7fac7399df70be83f1076115036abaad9e6424f.tar.gz
vyos-build-a7fac7399df70be83f1076115036abaad9e6424f.zip
T2490: add support for serial console-server
-rw-r--r--data/live-build-config/archives/buster-backports.pref.chroot8
-rwxr-xr-xdata/live-build-config/hooks/live/18-enable-disable_services.chroot2
-rwxr-xr-xscripts/live-build-config1
3 files changed, 11 insertions, 0 deletions
diff --git a/data/live-build-config/archives/buster-backports.pref.chroot b/data/live-build-config/archives/buster-backports.pref.chroot
index 92338d85..eea85202 100644
--- a/data/live-build-config/archives/buster-backports.pref.chroot
+++ b/data/live-build-config/archives/buster-backports.pref.chroot
@@ -10,6 +10,14 @@ Package: libnftnl11
Pin: release n=buster-backports
Pin-Priority: 600
+Package: conserver-server
+Pin: release n=buster-backports
+Pin-Priority: 600
+
+Package: conserver-client
+Pin: release n=buster-backports
+Pin-Priority: 600
+
Package: *
Pin: release n=buster-backports
Pin-Priority: -10
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index c4ab11c6..cb84d442 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -39,6 +39,8 @@ systemctl disable live-tools.service
systemctl disable wide-dhcpv6-client.service
systemctl disable lm-sensors.service
systemctl disable snmpd.service
+systemctl disable conserver-server.service
+systemctl disable dropbear.service
echo I: Enabling services
systemctl enable ssh-session-cleanup.service
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 6309c9c0..5c83e21a 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -57,6 +57,7 @@ lb config noauto \
--firmware-binary false \
--updates true \
--security true \
+ --backports true \
--apt-recommends false \
--apt-options "--yes -oAPT::Default-Release="current" -oAPT::Get::allow-downgrades=true" \
--apt-indices false