diff options
| author | Tomjon <tomjon@example.com> | 2013-09-19 14:54:47 +0000 |
|---|---|---|
| committer | Tomjon <tomjon@example.com> | 2013-09-19 14:54:47 +0000 |
| commit | 63bc906e23239905ab3b271fc25514a17b8eb10c (patch) | |
| tree | 5d867c2eb7cf7c58eb3224256576b29df8523833 | |
| parent | 8baf1288f945596eae06709f19ea4a2dbd4fe509 (diff) | |
| download | morphs-63bc906e23239905ab3b271fc25514a17b8eb10c.tar.gz | |
Install ntpd.conf in custom config ext as well
Rename the configuration extension to just ct-wand-1-cluster,
so we only need one custom one.
| -rwxr-xr-x | ct-wand-1-cluster.configure (renamed from ct-wand-1-cluster-fstab.configure) | 4 | ||||
| -rw-r--r-- | ct-wand-1-cluster/etc/ntpd.conf | 1 | ||||
| -rw-r--r-- | ct-wand-1-cluster/manifest | 1 | ||||
| -rw-r--r-- | devel-system-armv7-wandboard.morph | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ct-wand-1-cluster-fstab.configure b/ct-wand-1-cluster.configure index 40ec835..a1b8a49 100755 --- a/ct-wand-1-cluster-fstab.configure +++ b/ct-wand-1-cluster.configure @@ -2,10 +2,12 @@ set -e -if [ "x$FSTAB_SRC" != x ] +if [ "x$CT_DEMO_CONFIGURE" = "xyes" ] then cat << EOF >> "$1/etc/fstab" LABEL=src /src auto defaults 0 2 EOF + + echo "server 192.168.42.1" > "$1/etc/ntpd.conf" fi diff --git a/ct-wand-1-cluster/etc/ntpd.conf b/ct-wand-1-cluster/etc/ntpd.conf deleted file mode 100644 index a3ff507..0000000 --- a/ct-wand-1-cluster/etc/ntpd.conf +++ /dev/null @@ -1 +0,0 @@ -192.168.42.1 diff --git a/ct-wand-1-cluster/manifest b/ct-wand-1-cluster/manifest index be2a21c..64863c1 100644 --- a/ct-wand-1-cluster/manifest +++ b/ct-wand-1-cluster/manifest @@ -2,7 +2,6 @@ 0040755 0 0 /etc 0100666 0 0 /etc/morph.conf 0100666 0 0 /etc/resolv.conf -0100666 0 0 /etc/ntpd.conf 0040755 0 0 /etc/ssh 0100600 0 0 /etc/ssh/ssh_host_dsa_key 0100644 0 0 /etc/ssh/ssh_host_dsa_key.pub diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph index d5d101e..d4a51ed 100644 --- a/devel-system-armv7-wandboard.morph +++ b/devel-system-armv7-wandboard.morph @@ -49,4 +49,4 @@ configuration-extensions: - simple-network - nfsboot - install-files -- ct-demo-1-cluster-fstab +- ct-demo-1-cluster |