From 25ee2960f62a0d2c19cec09b02657934701672d6 Mon Sep 17 00:00:00 2001
From: Marllus Lustosa <marlluslustosa@gmail.com>
Date: Tue, 21 Jul 2020 18:09:01 -0300
Subject: [PATCH 1/3] Fixing the problem of the new name LABEL_FATBOOT in new
 SO, like Buster and Ubuntu 20.04

---
 cloudinit/sources/DataSourceNoCloud.py | 1 +
 tools/ds-identify                      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index e8856920db3..6b88741a369 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -41,6 +41,7 @@ def _get_devices(self, label):
 
         label_list = util.find_devs_with("LABEL=%s" % label.upper())
         label_list.extend(util.find_devs_with("LABEL=%s" % label.lower()))
+        label_list.extend( util.find_devs_with("LABEL_FATBOOT=%s" % label))
 
         devlist = list(set(fslist) & set(label_list))
         devlist.sort(reverse=True)
diff --git a/tools/ds-identify b/tools/ds-identify
index 071cdc0cadd..ebd05d98227 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -268,6 +268,8 @@ read_fs_info() {
                 dev=${line#DEVNAME=};;
             LABEL=*) label="${line#LABEL=}";
                      labels="${labels}${line#LABEL=}${delim}";;
+            LABEL_FATBOOT=*) label="${line#LABEL_FATBOOT=}";
+		             labels="${labels}${line#LABEL_FATBOOT=}${delim}";;
             TYPE=*) ftype=${line#TYPE=};;
             UUID=*) uuids="${uuids}${line#UUID=}$delim";;
         esac

From fe4014e97f683d065de77d25a4e99c763790ec22 Mon Sep 17 00:00:00 2001
From: Marllus Lustosa <marlluslustosa@riseup.net>
Date: Tue, 21 Jul 2020 19:08:09 -0300
Subject: [PATCH 2/3] add marlluslustosa as contributor

---
 tools/.github-cla-signers | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
index 78bce6c9821..ada06a93fec 100644
--- a/tools/.github-cla-signers
+++ b/tools/.github-cla-signers
@@ -6,6 +6,7 @@ dermotbradley
 dhensby
 landon912
 lucasmoura
+marlluslustosa
 matthewruffell
 nishigori
 onitake

From c2b967f5eb0809ca3a421e71009f7fab3953d0d1 Mon Sep 17 00:00:00 2001
From: Marllus Lustosa <marlluslustosa@riseup.net>
Date: Tue, 21 Jul 2020 19:17:30 -0300
Subject: [PATCH 3/3] origin master

---
 cloudinit/sources/DataSourceNoCloud.py | 1 -
 tools/ds-identify                      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index 6b88741a369..e8856920db3 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -41,7 +41,6 @@ def _get_devices(self, label):
 
         label_list = util.find_devs_with("LABEL=%s" % label.upper())
         label_list.extend(util.find_devs_with("LABEL=%s" % label.lower()))
-        label_list.extend( util.find_devs_with("LABEL_FATBOOT=%s" % label))
 
         devlist = list(set(fslist) & set(label_list))
         devlist.sort(reverse=True)
diff --git a/tools/ds-identify b/tools/ds-identify
index ebd05d98227..071cdc0cadd 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -268,8 +268,6 @@ read_fs_info() {
                 dev=${line#DEVNAME=};;
             LABEL=*) label="${line#LABEL=}";
                      labels="${labels}${line#LABEL=}${delim}";;
-            LABEL_FATBOOT=*) label="${line#LABEL_FATBOOT=}";
-		             labels="${labels}${line#LABEL_FATBOOT=}${delim}";;
             TYPE=*) ftype=${line#TYPE=};;
             UUID=*) uuids="${uuids}${line#UUID=}$delim";;
         esac