Import plainbox-provider-checkbox_0.58.0~rc1.orig.tar.gzupstream-0.58.0_rc1patched-0.58.0_rc1-1

2 files changed, 21 insertions, 15 deletions

diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index ba6b376..40d31af 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -346,25 +346,30 @@ _description: Attaches information about disk partitions
 plugin: attachment
 category_id: com.canonical.plainbox::info
 id: info/buildstamp
+template-engine: jinja2
 estimated_duration: 0.1
 _description: Attaches the buildstamp identifier for the OS
 _summary: Attaches the buildstamp identifier for the OS
 command:
- if [ -s /var/lib/ubuntu_dist_channel ]; then
- cat /var/lib/ubuntu_dist_channel
- elif [ -s /etc/buildstamp ]; then
- cat /etc/buildstamp
- elif [ -s /run/mnt/ubuntu-seed/.disk/info ]; then
- cat /run/mnt/ubuntu-seed/.disk/info
- elif [ -s /etc/media-info ]; then
- cat /etc/media-info
- elif [ -s /writable/system-data/etc/buildstamp ]; then
- cat /writable/system-data/etc/buildstamp
- elif [ -e /var/lib/snapd/seed/seed.yaml ]; then
- echo && date -r /var/lib/snapd/seed/seed.yaml -R
- else
- exit 1
- fi
+ {%- if __on_ubuntucore__ %}
+ if [ -s /run/mnt/ubuntu-seed/.disk/info ]; then
+ cat /run/mnt/ubuntu-seed/.disk/info
+ elif [ -s /writable/system-data/etc/buildstamp ]; then
+ cat /writable/system-data/etc/buildstamp
+ elif [ -e /var/lib/snapd/seed/seed.yaml ]; then
+ echo && date -r /var/lib/snapd/seed/seed.yaml -R
+ fi
+ {% else -%}
+ if [ -s /.disk/info ]; then # Ubuntu Classic
+ cat /.disk/info
+ elif [ -s /etc/media-info ]; then
+ cat /etc/media-info
+ elif [ -s /var/lib/ubuntu_dist_channel ]; then # PC projects
+ cat /var/lib/ubuntu_dist_channel
+ else
+ exit 1
+ fi
+ {% endif -%}
 
 plugin: shell
 category_id: com.canonical.plainbox::info
diff --git a/units/info/test-plan.pxu b/units/info/test-plan.pxu
index 6e59a73..52e4da3 100644
--- a/units/info/test-plan.pxu
+++ b/units/info/test-plan.pxu
@@ -52,6 +52,7 @@ include:
 sysctl_attachment
 sysfs_attachment
 udev_attachment
+ firmware/fwts_dump_acpi_attachment.gz
 bootstrap_include:
 device