Merge ~mitchdz/ubuntu/+source/ec2-hibinit-agent:mitch/fix-locale-quotes-focal into ubuntu/+source/ec2-hibinit-agent:ubuntu/focal-devel

[Mitchell Dzurick]

PPA: https://launchpad.net/~mitchdz/+archive/ubuntu/ec2-hibinit-agent-locale-and-quotes-fix

[Michael Hudson-Doyle (mwhudson)]

Thanks uploaded

review: Approve

[Mitchell Dzurick (mitchdz)]

for some reason `rmdir --ignore-fail-on-non-empty -p` fails with an exit code of 1, but properly removes all the directories I want. Therefore this d/postinst is a little different than the others by ignoring STDOUT/STDERR and passing the rmdir command unconditionally.

[Dan Bungert (dbungert)]

Uploaded, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 332a221..ff32d5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ec2-hibinit-agent (1.0.0-0ubuntu9.4) focal; urgency=medium
+
+    * d/p/lp2023924-remove-quotes-from-state-dir.patch: fixes an issue where a
+      weird directory would be created in root (LP: #2023924)
+    * d/p/lp2024505-fix-locale-issue.patch: fixes an issue where certain locales
+      can cause an error when trying to decode the output of `df -P`
+      (LP: #2024505)
+
+ -- Mitchell Dzurick <[e-mail]>  Tue, 20 Jun 2023 17:01:17 -0700
+
 ec2-hibinit-agent (1.0.0-0ubuntu9.3) focal; urgency=medium
 
   * d/p/lp1941785-Add-support-for-IMDSv2.patch: allow hibernation of
diff --git a/debian/patches/lp2023924-remove-quotes-from-state-dir.patch b/debian/patches/lp2023924-remove-quotes-from-state-dir.patch
new file mode 100644
index 0000000..d178d21
--- /dev/null
+++ b/debian/patches/lp2023924-remove-quotes-from-state-dir.patch
@@ -0,0 +1,19 @@
+Description: Remove quotes in config file for state_dir value
+It creates strange directory /"
+Author: Anchal Agarwal <[e-mail]>
+Origin: backport, https://github.com/aws/amazon-ec2-hibinit-agent/commit/d87d6365009f1663247fd8595b487c59d9b121f1
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ec2-hibinit-agent/+bug/2023924
+Last-Update: 2023-06-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/hibinit-config.cfg
++++ b/etc/hibinit-config.cfg
+@@ -12,7 +12,7 @@
+ touch-swap = False
+ 
+ # Location where to create any state files
+-state-dir = "/var/lib/hibinit-agent"
++state-dir = /var/lib/hibinit-agent
+ 
+ [swap]
+ # If there's no swap then we create it to be equal to the specified
diff --git a/debian/patches/lp2024505-fix-locale-issue.patch b/debian/patches/lp2024505-fix-locale-issue.patch
new file mode 100644
index 0000000..15a0a0d
--- /dev/null
+++ b/debian/patches/lp2024505-fix-locale-issue.patch
@@ -0,0 +1,18 @@
+Description: Change encoding to use the system locale instead of ascii.
+Author: einynot <[e-mail]>
+Origin: backport, https://github.com/aws/amazon-ec2-hibinit-agent/commit/2392e860c7a75c2b61baef749bb90e79a2a3e81e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ec2-hibinit-agent/+bug/2024505
+Last-Update: 2023-06-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/agent/hibinit-agent
++++ b/agent/hibinit-agent
+@@ -145,7 +145,7 @@
+ 
+ def find_device_for_file(filename):
+     # Find the mount point for the swap file ('df -P /swap')
+-    df_out = check_output(['df', '-P', filename]).decode('ascii')
++    df_out = check_output(['df', '-P', filename]).decode(sys.getfilesystemencoding())
+     dev_str = df_out.split("\n")[1].split()[0]
+     return dev_str
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7412d06..0656b89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@ detect-hibernate-cmd-by-default.patch
 0010-Update-grub-configuration-when-it-needs-an-update.patch
 lp1968805-Swapon-with-maximum-priority-before-hibernation.patch
 lp1941785-Add-support-for-IMDSv2.patch
+lp2023924-remove-quotes-from-state-dir.patch
+lp2024505-fix-locale-issue.patch
diff --git a/debian/postinst b/debian/postinst
index 382bb41..00c87ff 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,6 +2,27 @@
 
 set -e
 
+PREVIOUS_VERSION="$2"
+
+# https://bugs.launchpad.net/ubuntu/+source/ec2-hibinit-agent/+bug/2023924
+if [ "$PREVIOUS_VERSION" = "1.0.0-0ubuntu9.3" ]; then
+    dirpath="/\"/var/lib/hibinit-agent\""
+    filenamepath="${dirpath}/hibernation-enabled"
+
+    # If system has this package, but hibernation is not enabled, then
+    # $filenamepath will not exist, but $dirpath will
+    if [ -f "$filenamepath" ]; then
+        echo "Removing file $filenamepath"
+        rm -f $filenamepath
+    fi
+    if [ -d "$dirpath" ]; then
+        echo "Recursively removing directories $dirpath"
+        # For some reason, --ignore-fail-on-non-empty isn't working properly in
+        # Focal, but the parents are removed properly so forcing true
+        rmdir -p $dirpath > /dev/null 2>&1 || true
+    fi
+fi
+
 #DEBHELPER#
 
 case "$1" in