← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~smoser/maas/trunk.enlist_minor into lp:maas

 

Scott Moser has proposed merging lp:~smoser/maas/trunk.enlist_minor into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~smoser/maas/trunk.enlist_minor/+merge/125199

Simple change, make the "successful enlistment" message more clear

-- 
https://code.launchpad.net/~smoser/maas/trunk.enlist_minor/+merge/125199
Your team MAAS Maintainers is requested to review the proposed merge of lp:~smoser/maas/trunk.enlist_minor into lp:maas.
=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2012-09-07 15:53:57 +0000
+++ contrib/preseeds_v2/enlist_userdata	2012-09-19 13:25:35 +0000
@@ -13,8 +13,11 @@
      [ -n "${ip}" ] && host=$(dig +short -x $ip)  && host=${host%.}
    maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} >/tmp/enlist.out
    if [ $? -eq 0 ]; then
+      msg="successfully enlisted to '$url'"
+      [ -n "$host" ] && msg="$msg with hostname '$host'" ||
+         msg="$msg without hostname"
       echo
-      echo "=== $(date -R): successfully enlisted system to $host ==="
+      echo "=== $(date -R): $msg"
       cat  /tmp/enlist.out
       echo =============================================
       sleep 10