diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2013-11-29 10:37:37 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe@deserted.net> | 2013-11-29 10:56:31 -0500 |
| commit | 03e758cd6744d2be22636ce59dd74d8cfafd4783 (patch) | |
| tree | cce377ad16cda0eb0da8ffb15fabeadf4c90a4d5 /meta-networking | |
| parent | e09cd61957161b623b09bcdb8d3d18a49db5b0f4 (diff) | |
| download | meta-openembedded-contrib-03e758cd6744d2be22636ce59dd74d8cfafd4783.tar.gz | |
ntp: comment out the invalid server
When ntpd starts, it will create a daemon to connect this invalid server,
and fail, then ntpd will create other daemon to connect the local-only
(127.127.1.0) server.
The users should be aware that they need to configure the correct ntp
servers, a invalid server will lead to a redundant daemon, so it is better
to comment this example server to wait user to configure
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 1 | ||||
| -rw-r--r-- | meta-networking/recipes-support/ntp/files/ntp.conf | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb index d6bee9be14..0698a63258 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb @@ -70,6 +70,7 @@ do_install() { sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd fi + install -d ${D}${localstatedir}/run/vsftpd/empty } INITSCRIPT_PACKAGES = "${PN}" diff --git a/meta-networking/recipes-support/ntp/files/ntp.conf b/meta-networking/recipes-support/ntp/files/ntp.conf index a9cc838450..e80b661e25 100644 --- a/meta-networking/recipes-support/ntp/files/ntp.conf +++ b/meta-networking/recipes-support/ntp/files/ntp.conf @@ -5,7 +5,9 @@ driftfile /etc/ntp.drift # This obtains a random server which will be close # (in IP terms) to the machine. Add other servers # as required, or change this. -server time.server.example.com +# +# server time.server.example.com +# # Using local hardware clock as fallback # Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself server 127.127.1.0 |