From 40d0930727300c21ac24a9799078aa7a25e8a268 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 9 Jul 2023 20:44:27 +0200
Subject: T3355: remove legacy code and migrate remains to vyos-1x repo

---
 debian/control                        |  1 -
 debian/rules                          |  8 +-------
 debian/vyatta-cfg.install             |  2 --
 debian/vyatta-cfg.vyos-router.service | 19 -------------------
 4 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 debian/vyatta-cfg.vyos-router.service

(limited to 'debian')

diff --git a/debian/control b/debian/control
index 956255b..194d998 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Depends: sed (>= 4.1.5),
  libsocket6-perl,
  libvyatta-cfg1 (>=${binary:Version}),
  unionfs-fuse,
- systemd,
  uuid-runtime,
  libboost-filesystem1.74.0,
  libapt-pkg4.12 | libapt-pkg5.0 | libapt-pkg6.0,
diff --git a/debian/rules b/debian/rules
index 2603b2d..71f18d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 DIR := debian/vyatta-cfg
 VYOS_LIBEXEC_DIR := usr/libexec/vyos
-SYSTEM_GENERATORS_DIR := lib/systemd/system-generators
 
 export DH_OPTIONS
 
@@ -21,7 +20,7 @@ cfg_opts += CXXFLAGS="$(CXXFLAGS)"
 inst_opts := --sourcedir=debian/tmp
 
 %:
-	dh $@ --with=autoreconf,systemd
+	dh $@ --with=autoreconf
 
 autoreconf:
 	autoreconf -f -i
@@ -46,8 +45,3 @@ override_dh_auto_test:
 
 override_dh_install:
 	dh_install $(inst_opts)
-
-override_dh_systemd_enable:
-	dh_systemd_enable -pvyatta-cfg --name vyos-router vyos-router.service
-	dh_systemd_enable -pvyatta-cfg --name vyos vyos.target
-
diff --git a/debian/vyatta-cfg.install b/debian/vyatta-cfg.install
index 57c9ec9..e5b022e 100644
--- a/debian/vyatta-cfg.install
+++ b/debian/vyatta-cfg.install
@@ -3,5 +3,3 @@ opt/vyatta/share/vyatta-cfg/functions
 opt/vyatta/sbin
 opt/vyatta/etc
 bin
-usr/libexec
-lib
diff --git a/debian/vyatta-cfg.vyos-router.service b/debian/vyatta-cfg.vyos-router.service
deleted file mode 100644
index 6f683ce..0000000
--- a/debian/vyatta-cfg.vyos-router.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=VyOS Router
-After=systemd-journald-dev-log.socket time-sync.target local-fs.target cloud-config.service
-Requires=frr.service
-Conflicts=shutdown.target
-Before=systemd-user-sessions.service
-
-[Service]
-Type=simple
-Restart=no
-TimeoutSec=20min
-KillMode=process
-RemainAfterExit=yes
-ExecStart=/usr/libexec/vyos/init/vyos-router start
-ExecStop=/usr/libexec/vyos/init/vyos-router stop
-StandardOutput=journal+console
-
-[Install]
-WantedBy=vyos.target
-- 
cgit v1.2.3