Merge ~ahasenack/ubuntu/+source/base-files:focal-handle-was-removed-1895302 into ubuntu/+source/base-files:ubuntu/devel

[Andreas Hasenack]

Handle the creation and removal of the /etc/default/motd-news.wasremoved file in maintainer scripts.

I have two choices here:
a) handle the creation and removal of that file (this MP)
b) give up trying to handle that file, and just cleanup: https://git.launchpad.net/~ahasenack/ubuntu/+source/base-files/commit/?h=groovy-drop-wasremoved&id=1c8983d04fdadf831976cbe42259a4b9b5b79d0b

To recap, the idea behind /e/d/motd-news.wasremoved was to handle the case where:
- user had base-files and ubuntu-server from before the split, meaning /e/d/motd-news is a config file part of base-files
- motd-news is enabled (ENABLED=1 in /e/d/motd-news)
- in an erroneous attempt to disable the service, the user removes the /e/d/motd-news file. ENABLED doesn't get set, and the motd-news script just exits

In the above scenario, without the .wasremoved feature, if the user upgraded to the updated packages with the spit, then /e/d/motd-news would be reinstated because it's now part of the motd-news-config package. This would re-enable the motd-news feature, something we want to be careful about.

The implementation suffers from some problems, though:
- a fresh install of base-files, like done via debootstrap, will create the .wasremoved file. If you then install motd-news-config (via apt install ubuntu-server, for example), the motd-news-config postinst fill find the .wasremoved file, see it's a fresh install of motd-news-config, and disable motd-news. This is the current situation in the groovy lxd images, for example
- if you just have base-files installed, no motd-news-config, and then reinstall or upgrade base-files, the .wasremoved will be created

To address those, this MP (choice (a)) does:
- motd-news-config postinst: always remove the .wasremoved file in configure if found, regardless if /etc/default/motd-news was sed'ed or not, or if we are upgrading or on a first install
- base-files postinst: guard the creation of .wasremoved with:
  - Only during an upgrade
  - Only if ubuntu-server is installed (via a dpkg -l check)

If a user again decides to erroneously disable motd-news by removing /e/d/motd-news, then an upgrade of base-files, motd-news-config and ubuntu-server will go through the creation and removal of the .wasremoved file, but no new /e/d/motd-news config file will be created or changed, and motd-news will at least remain disabled. But it's extra unnecessary churn, as the corner case it handles only happens when upgrading from before the motd-news-config split.

The dpkg -l check for ubuntu-server relies on ubuntu-server depending (and not just recommending) on motd-news-config. I'm a bit afraid of the dpkg -l call in base-files' postinst:
- Locking issues?
- I'm checking for ^i, should I be looking for other cases? Other flags?
- At least dpkg is already installed, as I see other calls to it in the same postinst

If we find other issues in these maintainer scripts regarding the motd-news-config split, or introduce new ones with these changes, it will get harder and harder to fix each time. That's why I also have to consider simply giving up and living with the corner case we tried to handle in the beginning, and that is this diff: https://git.launchpad.net/~ahasenack/ubuntu/+source/base-files/commit/?h=groovy-drop-wasremoved&id=1c8983d04fdadf831976cbe42259a4b9b5b79d0b Just note that in this case, the corner case scenario will leave motd-news enabled when it was supposed to be disabled.

I have PPAs for both scenarios, with groovy and focal packages (just not yet bionic or xenial):

Give up handling of .wasremoved: https://launchpad.net/~ahasenack/+archive/ubuntu/motd-news-drop-wasremoved/

Try to fix handling of .wasremoved: https://launchpad.net/~ahasenack/+archive/ubuntu/motd-news-wasremoved-handling/

May the best one win :)

Unmerged commits

8a66e5c... by Andreas Hasenack on 2020-09-14

changelog

6fcd366... by Andreas Hasenack on 2020-09-11

  * d/motd-news-config.postinst: always remove /e/d/motd-news.wasremoved
    if present

9b68a73... by Andreas Hasenack on 2020-09-11

  * d/postinst.in: re-arrange the cascading conditionals around the
    creation of the .wasremoved file for better clarity

03931a2... by Andreas Hasenack on 2020-09-11

  * d/postinst.in: check if ubuntu-server is installed before creating
    the .wasremoved file

6f3fbdb... by Andreas Hasenack on 2020-08-14

  * d/control: set priority to optional for motd-news-config to avoid
    having it pulled in by the release upgrader

1c5b4b9... by Andreas Hasenack on 2020-08-17

changelog

d06cb18... by Steve Langasek on 2020-07-10

  [ Steve Langasek ]
  * motd/50-motd-news: use wget instead of curl, since wget is standard but
    curl is optional (LP: #1888572):
    - This changes the timeout behavior slightly because wget does not have
      an exact equivalent to curl's --max-time argument, we are using
      --timeout instead.

c4e4748... by Andreas Hasenack on 2020-08-06

    - d/rules, d/motd-news-config.install: /e/d/motd-news is in the
      motd-news-config package now

d217183... by Andreas Hasenack on 2020-08-06

    - d/control: new motd-news-config package, carrying the
      configuration file for the /etc/update-motd.d/50-motd-news script.

78f2dc7... by Andreas Hasenack on 2020-08-10

    - d/postinst.in: signal the motd-news-config package if the
      motd-news config file was removed manually before the upgrade

diff --git a/debian/base-files.maintscript b/debian/base-files.maintscript
index 9972f51..b1e3c88 100644
--- a/debian/base-files.maintscript
+++ b/debian/base-files.maintscript
@@ -1 +1,5 @@
+<<<<<<< debian/base-files.maintscript
 rm_conffile /etc/default/motd-news 11ubuntu11~ base-files
+=======
+rm_conffile /etc/default/motd-news 11ubuntu5.2~ base-files
+>>>>>>> debian/base-files.maintscript
diff --git a/debian/changelog b/debian/changelog
index eb44a50..5146861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 base-files (11ubuntu12) groovy; urgency=medium
 
   * d/control: set priority to optional for motd-news-config to avoid
@@ -7,11 +8,33 @@ base-files (11ubuntu12) groovy; urgency=medium
 
 base-files (11ubuntu11) groovy; urgency=medium
 
+=======
+base-files (11ubuntu5.3) focal; urgency=medium
+
+  * d/postinst.in: check if ubuntu-server is installed before creating
+    the .wasremoved file
+  * d/postinst.in: re-arrange the cascading conditionals around the
+    creation of the .wasremoved file for better clarity
+  * d/motd-news-config.postinst: always remove /e/d/motd-news.wasremoved
+    if present
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 14 Sep 2020 18:06:37 -0300
+
+base-files (11ubuntu5.2) focal; urgency=medium
+
+  [ Andreas Hasenack ]
+  * motd/50-motd-news: don't include uptime in the user-agent string
+    (LP: #1886572)
+>>>>>>> debian/changelog
   * Move the /etc/default/motd-news conffile to the motd-news-config
     package (LP: #1888575):
     - d/base-files.maintscript: remove /etc/default/motd-news config file
       on upgrade
+<<<<<<< debian/changelog
     - d/control: break on ubuntu-server << 1.453 to force an upgrade if
+=======
+    - d/control: break on ubuntu-server << 1.450.2 to force an upgrade if
+>>>>>>> debian/changelog
       it is installed, which will pull motd-news-config and the conffile
       back in
     - d/motd-news-config.postinst:
@@ -26,6 +49,7 @@ base-files (11ubuntu11) groovy; urgency=medium
     - d/rules, d/motd-news-config.install: /e/d/motd-news is in the
       motd-news-config package now
 
+<<<<<<< debian/changelog
  -- Andreas Hasenack <[e-mail]>  Mon, 10 Aug 2020 21:02:37 +0000
 
 base-files (11ubuntu10) groovy; urgency=medium
@@ -41,10 +65,16 @@ base-files (11ubuntu9) groovy; urgency=medium
 
   * motd/50-motd-news: use wget instead of curl, since wget is standard but
     curl is optional.
+=======
+  [ Steve Langasek ]
+  * motd/50-motd-news: use wget instead of curl, since wget is standard but
+    curl is optional (LP: #1888572):
+>>>>>>> debian/changelog
     - This changes the timeout behavior slightly because wget does not have
       an exact equivalent to curl's --max-time argument, we are using
       --timeout instead.
 
+<<<<<<< debian/changelog
  -- Steve Langasek <[e-mail]>  Fri, 10 Jul 2020 09:58:46 -0700
 
 base-files (11ubuntu8) groovy; urgency=medium
@@ -66,6 +96,16 @@ base-files (11ubuntu6) groovy; urgency=medium
   * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Groovy Gorilla!
 
  -- Matthias Klose <[e-mail]>  Fri, 24 Apr 2020 17:11:27 +0200
+=======
+ -- Andreas Hasenack <[e-mail]>  Mon, 17 Aug 2020 10:31:58 -0300
+
+base-files (11ubuntu5.1) focal; urgency=medium
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Bump
+    version number to 20.04.1 in preparation of the next point release.
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 15 Jul 2020 10:59:48 +0200
+>>>>>>> debian/changelog
 
 base-files (11ubuntu5) focal; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1dbf9b9..d87d63a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,11 @@ Essential: yes
 Priority: required
 Replaces: base, miscutils, dpkg (<= 1.15.0)
 Breaks: debian-security-support (<< 2019.04.25), initscripts (<< 2.88dsf-13.3), sendfile (<< 2.1b.20080616-5.2~),
+<<<<<<< debian/control
  ubuntu-server (<< 1.453)
+=======
+ ubuntu-server (<< 1.450.2)
+>>>>>>> debian/control
 Multi-Arch: foreign
 Description: Debian base system miscellaneous files
  This package contains the basic filesystem hierarchy of a Debian system, and
@@ -33,8 +37,13 @@ Description: LSB release information
 Package: motd-news-config
 Architecture: all
 Priority: optional
+<<<<<<< debian/control
 Breaks: base-files (<< 11ubuntu11)
 Replaces: base-files (<< 11ubuntu11)
+=======
+Breaks: base-files (<< 11ubuntu5.2)
+Replaces: base-files (<< 11ubuntu5.2)
+>>>>>>> debian/control
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Configuration for motd-news shipped in base-files
  This package contains the configuration read by the motd-news script
diff --git a/debian/motd-news-config.postinst b/debian/motd-news-config.postinst
index a73427f..2b4fafd 100644
--- a/debian/motd-news-config.postinst
+++ b/debian/motd-news-config.postinst
@@ -33,9 +33,17 @@ case "$1" in
           fi
           if [ -e /etc/default/motd-news.wasremoved ] && [ -e /etc/default/motd-news ]; then
               sed -i -e 's/^ENABLED=1/# Changed by motd-news-config.postinst:\n# config file was manually removed - disable the service\nENABLED=0/' /etc/default/motd-news
+<<<<<<< debian/motd-news-config.postinst
               rm /etc/default/motd-news.wasremoved
           fi
       fi
+=======
+          fi
+      fi
+      if [ -e /etc/default/motd-news.wasremoved ]; then
+          rm /etc/default/motd-news.wasremoved
+      fi
+>>>>>>> debian/motd-news-config.postinst
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postinst.in b/debian/postinst.in
index c347a62..c81e89a 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -130,12 +130,24 @@ fi
 # it does not put back the file with default contents which would
 # re-enable motd-news
 motd_news_config="/etc/default/motd-news"
+<<<<<<< debian/postinst.in
 if [ ! -e ${motd_news_config} ]; then
   if [ ! -e ${motd_news_config}.dpkg-remove ]; then
     if [ ! -e ${motd_news_config}.dpkg-backup ]; then
       touch ${motd_news_config}.wasremoved
     fi
   fi
+=======
+if [ "$2" != "" ] && \
+   [ ! -e ${motd_news_config} ] && \
+   [ ! -e ${motd_news_config}.dpkg-remove ] && \
+   [ ! -e ${motd_news_config}.dpkg-backup ]; then
+      # The .wasremoved file only matters if ubuntu-server is installed,
+      # because that's what will pull in motd-news-config
+      if dpkg -l ubuntu-server 2>/dev/null | grep -q ^i; then
+        touch ${motd_news_config}.wasremoved
+      fi
+>>>>>>> debian/postinst.in
 fi
 
 #DEBHELPER#
diff --git a/etc/issue b/etc/issue
index 62288be..eb7b599 100644
--- a/etc/issue
+++ b/etc/issue
@@ -1,2 +1,6 @@
+<<<<<<< etc/issue
 Ubuntu Groovy Gorilla (development branch) \n \l
+=======
+Ubuntu 20.04.1 LTS \n \l
+>>>>>>> etc/issue
 
diff --git a/etc/issue.net b/etc/issue.net
index e86fc46..4b1d230 100644
--- a/etc/issue.net
+++ b/etc/issue.net
@@ -1 +1,5 @@
+<<<<<<< etc/issue.net
 Ubuntu Groovy Gorilla (development branch)
+=======
+Ubuntu 20.04.1 LTS
+>>>>>>> etc/issue.net
diff --git a/etc/lsb-release b/etc/lsb-release
index b08a2f9..83ad511 100644
--- a/etc/lsb-release
+++ b/etc/lsb-release
@@ -1,4 +1,10 @@
 DISTRIB_ID=Ubuntu
+<<<<<<< etc/lsb-release
 DISTRIB_RELEASE=20.10
 DISTRIB_CODENAME=groovy
 DISTRIB_DESCRIPTION="Ubuntu Groovy Gorilla (development branch)"
+=======
+DISTRIB_RELEASE=20.04
+DISTRIB_CODENAME=focal
+DISTRIB_DESCRIPTION="Ubuntu 20.04.1 LTS"
+>>>>>>> etc/lsb-release
diff --git a/etc/os-release b/etc/os-release
index 3ccc041..aac715d 100644
--- a/etc/os-release
+++ b/etc/os-release
@@ -1,9 +1,17 @@
 NAME="Ubuntu"
+<<<<<<< etc/os-release
 VERSION="20.10 (Groovy Gorilla)"
 ID=ubuntu
 ID_LIKE=debian
 PRETTY_NAME="Ubuntu Groovy Gorilla (development branch)"
 VERSION_ID="20.10"
+=======
+VERSION="20.04.1 LTS (Focal Fossa)"
+ID=ubuntu
+ID_LIKE=debian
+PRETTY_NAME="Ubuntu 20.04.1 LTS"
+VERSION_ID="20.04"
+>>>>>>> etc/os-release
 HOME_URL="https://www.ubuntu.com/"
 SUPPORT_URL="https://help.ubuntu.com/"
 BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"