diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg index 97a02d2..2a01ef7 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg @@ -25,10 +25,10 @@ PurgeObsoletes=yes # the dist-upgrade (not to be confused with the PostUpgrade hooks in the # quirks handling) #PostUpgradePurge=linux-restricted-modules-common -#PostUpgradeRemove=xsettings-kde +PostUpgradeRemove=resolvconf,notification-daemon #PostUpgradeUpgrade=brasero,edubuntu-desktop #PostUpgradeInstall=apt -PostInstallScripts=./trisquel-postinstall.sh +#PostInstallScripts=./trisquel-postinstall.sh EnableApport=yes # this supported blacklisting certain versions to ensure we do not upgrade # - 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/ [KernelRemoval] -Version=4.2.0 +Version=4.4.0 BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules, linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools, linux-image-extra diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.flidas b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.flidas index 0a81798..2a01ef7 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.flidas +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.flidas @@ -25,10 +25,10 @@ PurgeObsoletes=yes # the dist-upgrade (not to be confused with the PostUpgrade hooks in the # quirks handling) #PostUpgradePurge=linux-restricted-modules-common -#PostUpgradeRemove=xsettings-kde +PostUpgradeRemove=resolvconf,notification-daemon #PostUpgradeUpgrade=brasero,edubuntu-desktop #PostUpgradeInstall=apt -PostInstallScripts=./trisquel-postinstall.sh +#PostInstallScripts=./trisquel-postinstall.sh EnableApport=yes # this supported blacklisting certain versions to ensure we do not upgrade # - blcr-dkms fails to build on kernel 2.6.35 diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 1dac9b0..083bf4b 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -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