MAAS

Merge ~blake-rouse/maas:fix-setup-dns-snap into maas:master

  1. Git
  2. lp:~blake-rouse/maas
  3. fix-setup-dns-snap
  4. Merge into master
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: 18bca3872391c89bbb6cfd8ef283181d89cbb114
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~blake-rouse/maas:fix-setup-dns-snap
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
snap/bin/run-named (+1/-1)
Reviewer Review Type Date Requested Status
Björn Tillenius Approve
MAAS Lander unittests Pending
Review via email: mp+347448@code.launchpad.net

Commit message

Fix location of maas-common in run-named in snap.

To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/bin/run-named b/snap/bin/run-named
2index 3760003..822bcf5 100755
3--- a/snap/bin/run-named
4+++ b/snap/bin/run-named
5@@ -15,7 +15,7 @@ cp -f $SNAP/usr/share/maas/bind/named.conf $SNAP_DATA/bind/
6 mkdir -p $SNAP_DATA/bind/cache
7
8 # MAAS finalize bind configuration.
9-MAAS_DNS_CONFIG_DIR="$SNAP_DATA/bind" $SNAP/bin/maas-common setup-dns
10+MAAS_DNS_CONFIG_DIR="$SNAP_DATA/bind" $SNAP/usr/lib/maas/maas-common setup-dns
11
12 # Run named.
13 exec $SNAP/usr/sbin/named -c "$SNAP_DATA/bind/named.conf" -g

Subscribers

People subscribed via source and target branches