diff options
| author | Yuxiang Zhu <vfreex@gmail.com> | 2022-11-14 10:23:46 +0800 |
|---|---|---|
| committer | Yuxiang Zhu <vfreex@gmail.com> | 2022-11-15 13:56:56 +0800 |
| commit | ff901a52bb9acd4bdd0e3a96033c896e4667a6af (patch) | |
| tree | 050292e6ba92248a02948c430ec5da778e90833d /debian/vyos-1x.postinst | |
| parent | b3e524c29e9f5c8e7536ba86de9097be70fe5fb6 (diff) | |
| download | vyos-1x-ff901a52bb9acd4bdd0e3a96033c896e4667a6af.tar.gz vyos-1x-ff901a52bb9acd4bdd0e3a96033c896e4667a6af.zip | |
backport: T4815: Fix various name server config issues
This is a backport of https://github.com/vyos/vyos-1x/pull/1656.
Note I also changed `ip-down.script.tmpl` to not wait for `systemctl
stop dhcp6c@$iface.service`, because that command is slow and pppd will
kill the ip-down script if it times out.
I didn't see `ip-down.script.tmpl` or its equivalent in the 1.4 branch.
Not sure if there is another mechanism to handle that functionality or
it is missed.
Diffstat (limited to 'debian/vyos-1x.postinst')
| -rw-r--r-- | debian/vyos-1x.postinst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst index d54f6c5af..6ff466c27 100644 --- a/debian/vyos-1x.postinst +++ b/debian/vyos-1x.postinst @@ -36,7 +36,7 @@ chsh -s /bin/sh proxy # Remove unwanted daemon files from /etc # conntackd -DELETE="/etc/logrotate.d/conntrackd.distrib /etc/init.d/conntrackd /etc/default/conntrackd" +DELETE="/etc/logrotate.d/conntrackd.distrib /etc/init.d/conntrackd /etc/default/conntrackd /etc/ppp/ip-up.d/0000usepeerdns /etc/ppp/ip-down.d/0000usepeerdns" for file in $DELETE; do if [ -f ${file} ]; then rm -f ${file} |