diff options
| -rw-r--r-- | units/bluetooth/manifest.pxu | 4 | ||||
| -rw-r--r-- | units/ethernet/manifest.pxu | 2 | ||||
| -rw-r--r-- | units/info/jobs.pxu | 35 | ||||
| -rw-r--r-- | units/watchdog/manifest.pxu | 2 | ||||
| -rw-r--r-- | units/wireless/manifest.pxu | 2 | ||||
| -rw-r--r-- | units/wwan/manifest.pxu | 2 |
6 files changed, 26 insertions, 21 deletions
diff --git a/units/bluetooth/manifest.pxu b/units/bluetooth/manifest.pxu index 576f7a8..a2baf44 100644 --- a/units/bluetooth/manifest.pxu +++ b/units/bluetooth/manifest.pxu @@ -1,9 +1,9 @@ unit: manifest entry id: has_bt_adapter -_name: A Bluetooth Adapter +_name: A Bluetooth Module value-type: bool unit: manifest entry id: has_bt_smart -_name: Bluetooth Smart (4.0 or later) Support +_name: A Bluetooth Module with Smart (4.0 or later) Support value-type: bool diff --git a/units/ethernet/manifest.pxu b/units/ethernet/manifest.pxu index 6936344..07b4654 100644 --- a/units/ethernet/manifest.pxu +++ b/units/ethernet/manifest.pxu @@ -1,4 +1,4 @@ unit: manifest entry id: has_ethernet_adapter -_name: An Ethernet Adapter +_name: An Ethernet Port value-type: bool 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/watchdog/manifest.pxu b/units/watchdog/manifest.pxu index d80d7e1..e93385f 100644 --- a/units/watchdog/manifest.pxu +++ b/units/watchdog/manifest.pxu @@ -1,5 +1,5 @@ unit: manifest entry id: has_hardware_watchdog -_name: Hardware Watchdog +_name: A Hardware Watchdog Timer value-type: bool diff --git a/units/wireless/manifest.pxu b/units/wireless/manifest.pxu index ed92bf6..38353b4 100644 --- a/units/wireless/manifest.pxu +++ b/units/wireless/manifest.pxu @@ -1,4 +1,4 @@ unit: manifest entry id: has_wlan_adapter -_name: A WLAN Adapter +_name: A Wi-Fi Module value-type: bool diff --git a/units/wwan/manifest.pxu b/units/wwan/manifest.pxu index b15b01f..8420e2e 100644 --- a/units/wwan/manifest.pxu +++ b/units/wwan/manifest.pxu @@ -6,5 +6,5 @@ unit: manifest entry id: has_wwan_module -_name: WWAN module +_name: A WWAN Module value-type: bool |