Merge ~andreserl/maas:really_workaround_lp1711760 into maas:master

[Andres Rodriguez]

LP: #1711760 - Fix incorrect comparison that caused to always use the work around.

Drive-by fix to update the API documentation.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

[MAAS Lander (maas-lander)]

UNABLE TO START LANDING

STATUS: MISSING COMMIT MESSAGE

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 12358af..c382c83 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -560,7 +560,7 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
             Some drives implement secure erasure by overwriting themselves so
             this could still be slow.
         :type secure_erase: boolean
-        :param quick_erase: Wipe 1MiB at the start and at the end of the drive
+        :param quick_erase: Wipe 2MiB at the start and at the end of the drive
             to make data recovery inconvenient and unlikely to happen by
             accident. This is not secure.
         :type quick_erase: boolean
diff --git a/src/metadataserver/user_data/templates/base_user_data.sh b/src/metadataserver/user_data/templates/base_user_data.sh
index 2a8e911..e9aae3e 100644
--- a/src/metadataserver/user_data/templates/base_user_data.sh
+++ b/src/metadataserver/user_data/templates/base_user_data.sh
@@ -18,7 +18,7 @@ mkdir -p "$BIN_D"
 # Work around issue where resolv.conf is not set on the  ephemeral environment
 #
 # First check if a nameserver is set in resolv.conf
-if ! echo /etc/resolv.conf | grep -qs "nameserver"; then
+if ! grep -qs nameserver /etc/resolv.conf; then
     # If it is not, obtain the MAC address of the PXE boot interface
     mac_address=$(cat /proc/cmdline | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')