Package: ntp Version: 1:4.2.8p7+dfsg-3 Hi, this is another bug I found while cleaning up and again I'd prefer to just fix it in Debian instead working around it in Ubuntu (alone). Also it is surely worth another opinion/review on it.
This is about providing a way to allow a user to specify a custom ntp config file. But only so if dhcp did not provide one to allow dhcp to overwrite. The patch is a slightly extended version of what was reported to us on the Ubuntu bug (plus actual config and a bit of a helper text). BTW - I currently submit a lot of smaller fixes and I guess after Discussion they will all fit in one upload. That is why I send individual patches instead of a debdiff. But if you would prefer debdiffs let me know.
diff --git a/ntp-4.2.8p7+dfsg/debian/ntp.default b/ntp-4.2.8p7+dfsg/debian/ntp.default index af78139..02562f7 100644 --- a/ntp-4.2.8p7+dfsg/debian/ntp.default +++ b/ntp-4.2.8p7+dfsg/debian/ntp.default @@ -1 +1,6 @@ NTPD_OPTS='-g' + +# Can be set to a custom ntp config file that shall be provided to ntp. +# If ntp options are provided via dhcp this custom config is ignored +# in favor of the generated /var/lib/ntp/ntp.conf.dhcp config. +NTPD_CONF='' diff --git a/ntp-4.2.8p7+dfsg/debian/ntp.init b/ntp-4.2.8p7+dfsg/debian/ntp.init index 7eb932e..d29a7ff 100644 --- a/ntp-4.2.8p7+dfsg/debian/ntp.init +++ b/ntp-4.2.8p7+dfsg/debian/ntp.init @@ -24,6 +24,8 @@ fi if [ -e /var/lib/ntp/ntp.conf.dhcp ]; then NTPD_OPTS="$NTPD_OPTS -c /var/lib/ntp/ntp.conf.dhcp" +elif [ -n "$NTPD_CONF" ]; then + NTPD_OPTS="$NTPD_OPTS -c $NTPD_CONF" fi
