Better method to remove resolvconf on dist upgrade
This commit is contained in:
parent
5ba1722f40
commit
9157debd8c
3 changed files with 6 additions and 22 deletions
|
|
@ -24,7 +24,7 @@
|
|||
# Also, don't forget to update the meta-release files at archive and packages.t.i
|
||||
# The "obsoletes" list from ubuntu has been removed
|
||||
|
||||
VERSION=8
|
||||
VERSION=9
|
||||
|
||||
. ./config
|
||||
|
||||
|
|
@ -231,22 +231,6 @@ https://ftp.yzu.edu.tw/Linux/trisquel.packages/
|
|||
https://mirrors.ocf.berkeley.edu/trisquel/
|
||||
EOF
|
||||
|
||||
cat << EOF1 > DistUpgrade/trisquel-postinstall.sh
|
||||
#!/bin/sh
|
||||
|
||||
# Make sure these are gone
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
apt-get remove --force-yes -y notification-daemon resolvconf
|
||||
|
||||
# Default to systemd-resolved
|
||||
if [ "\$(readlink /etc/resolv.conf)" != "/run/systemd/resolve/stub-resolv.conf" ]; then
|
||||
mv /etc/resolv.conf /etc/resolv.conf.flidas.bak
|
||||
ln -s /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
|
||||
fi
|
||||
EOF1
|
||||
chmod 755 DistUpgrade/trisquel-postinstall.sh
|
||||
sed '/self._view.getTerminal/s|\[script\]|["/bin/sh",script]|' -i ./DistUpgrade/DistUpgradeController.py
|
||||
|
||||
replace changelogs.ubuntu.com packages.trisquel.info .
|
||||
|
||||
rpl 11\.04 5\.0 DistUpgrade/*.ui
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue