PC enablement tools

Merge ~alextu/pc-enablement/+git/pc-sanity-backgroud-photo:get_hic_cid_v2 into ~oem-solutions-engineers/pc-enablement/+git/pc-sanity-backgroud-photo:master

  1. Git
  2. lp:~alextu/pc-enablement/+git/pc-sanity-backgroud-photo
  3. get_hic_cid_v2
  4. Merge into master
Proposed by Alex Tu
Status: Merged
Merged at revision: 35be8c0155b036d8e801c8d016ee1abb27997267
Proposed branch: ~alextu/pc-enablement/+git/pc-sanity-backgroud-photo:get_hic_cid_v2
Merge into: ~oem-solutions-engineers/pc-enablement/+git/pc-sanity-backgroud-photo:master
Diff against target: 17 lines (+4/-1)
1 file modified
usr/sbin/pc-sanity-backgroud-photo (+4/-1)
Reviewer Review Type Date Requested Status
Cyrus Lien Approve
Review via email: mp+423244@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cyrus Lien (cyruslien) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/usr/sbin/pc-sanity-backgroud-photo b/usr/sbin/pc-sanity-backgroud-photo
2index 14f35e2..56a2597 100755
3--- a/usr/sbin/pc-sanity-backgroud-photo
4+++ b/usr/sbin/pc-sanity-backgroud-photo
5@@ -10,8 +10,11 @@ eval convert -pointsize 200 -fill white -draw \'text 330,400 \"$ISO_NAME\" \' $I
6
7 while [ 1 ]; do
8 for i in `cat /sys/class/net/*/address`; do
9+ if [ "$i" == "00:00:00:00:00:00" ] || [ "$i" == "FF:FF:FF:FF:FF:FF" ] || [ "$i" == "88:88:88:88:87:88" ] ; then
10+ continue
11+ fi
12 SKU=$(wget http://10.102.180.14:5000/q?db -O /dev/stdout | jq -r ".[\"$i\"]")
13- if [ -n "$SKU" ]; then
14+ if [ "$SKU" != "null" ]; then
15 eval convert -pointsize 200 -fill yellow -draw \'text 330,600 \"$SKU\" \' $IMG_PATH $IMG_PATH
16 break 2
17 fi

Subscribers

People subscribed via source and target branches