CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better method to remove resolvconf on dist upgrade

Browse source
This commit is contained in:
Ruben Rodriguez 2020-04-20 00:43:57 -04:00
parent 5ba1722f40
commit 9157debd8c
3 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg
View file

@ -25,10 +25,10 @@ PurgeObsoletes=yes
# the dist-upgrade (not to be confused with the PostUpgrade hooks in the # the dist-upgrade (not to be confused with the PostUpgrade hooks in the
# quirks handling) # quirks handling)
#PostUpgradePurge=linux-restricted-modules-common #PostUpgradePurge=linux-restricted-modules-common
#PostUpgradeRemove=xsettings-kde PostUpgradeRemove=resolvconf,notification-daemon
#PostUpgradeUpgrade=brasero,edubuntu-desktop #PostUpgradeUpgrade=brasero,edubuntu-desktop
#PostUpgradeInstall=apt #PostUpgradeInstall=apt
PostInstallScripts=./trisquel-postinstall.sh #PostInstallScripts=./trisquel-postinstall.sh
EnableApport=yes EnableApport=yes
# this supported blacklisting certain versions to ensure we do not upgrade # this supported blacklisting certain versions to ensure we do not upgrade
# - blcr-dkms fails to build on kernel 2.6.35 # - blcr-dkms fails to build on kernel 2.6.35
@ -37,7 +37,7 @@ EnableApport=yes
#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
[KernelRemoval] [KernelRemoval]
Version=4.2.0 Version=4.4.0
BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules, BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,
linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools, linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools,
linux-image-extra linux-image-extra

4
helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.flidas
View file

@ -25,10 +25,10 @@ PurgeObsoletes=yes
# the dist-upgrade (not to be confused with the PostUpgrade hooks in the # the dist-upgrade (not to be confused with the PostUpgrade hooks in the
# quirks handling) # quirks handling)
#PostUpgradePurge=linux-restricted-modules-common #PostUpgradePurge=linux-restricted-modules-common
#PostUpgradeRemove=xsettings-kde PostUpgradeRemove=resolvconf,notification-daemon
#PostUpgradeUpgrade=brasero,edubuntu-desktop #PostUpgradeUpgrade=brasero,edubuntu-desktop
#PostUpgradeInstall=apt #PostUpgradeInstall=apt
PostInstallScripts=./trisquel-postinstall.sh #PostInstallScripts=./trisquel-postinstall.sh
EnableApport=yes EnableApport=yes
# this supported blacklisting certain versions to ensure we do not upgrade # this supported blacklisting certain versions to ensure we do not upgrade
# - blcr-dkms fails to build on kernel 2.6.35 # - blcr-dkms fails to build on kernel 2.6.35

18
helpers/make-ubuntu-release-upgrader
View file

@ -24,7 +24,7 @@
# Also, don't forget to update the meta-release files at archive and packages.t.i # Also, don't forget to update the meta-release files at archive and packages.t.i
# The "obsoletes" list from ubuntu has been removed # The "obsoletes" list from ubuntu has been removed
VERSION=8 VERSION=9
. ./config . ./config
@ -231,22 +231,6 @@ https://ftp.yzu.edu.tw/Linux/trisquel.packages/
https://mirrors.ocf.berkeley.edu/trisquel/ https://mirrors.ocf.berkeley.edu/trisquel/
EOF 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 . replace changelogs.ubuntu.com packages.trisquel.info .
rpl 11\.04 5\.0 DistUpgrade/*.ui rpl 11\.04 5\.0 DistUpgrade/*.ui