Fix relocating NTP binaries.

diff --git a/config/rootfiles/common/ntp b/config/rootfiles/common/ntp
index 5f21e830f4ad9a4d59c9b44c776b7feae4c5a500..883d4ff7ded74e3c1a95bd491575dcc0fbe9e557 100644 (file)
--- a/config/rootfiles/common/ntp
+++ b/config/rootfiles/common/ntp
@@ -1,24 +1,24 @@
 etc/ntp
 etc/ntp.conf
+etc/rc.d/rc0.d/K46ntpd
+etc/rc.d/rc3.d/S26ntpd
+etc/rc.d/rc6.d/K46ntpd
+usr/bin/ntp-keygen
+usr/bin/ntp-wait
 usr/bin/ntpd
 usr/bin/ntpdate
 usr/bin/ntpdc
+usr/bin/ntpq
+usr/bin/ntptime
+usr/bin/ntptrace
 usr/bin/sntp
-#usr/man/man1/ntp-keygen.1
-#usr/man/man1/ntpd.1
-#usr/man/man1/ntpdc.1
-#usr/man/man1/ntpdsim.1
-#usr/man/man1/ntpq.1
-#usr/man/man1/sntp.1
-usr/sbin/ntp-keygen
-usr/sbin/ntp-wait
-usr/sbin/ntpq
-usr/sbin/ntptime
-usr/sbin/ntptrace
-usr/sbin/tickadj
-etc/rc.d/rc0.d/K46ntpd
-etc/rc.d/rc6.d/K46ntpd
-etc/rc.d/rc3.d/S26ntpd
+usr/bin/tickadj
+#usr/share/man/man1/ntp-keygen.1
+#usr/share/man/man1/ntpd.1
+#usr/share/man/man1/ntpdc.1
+#usr/share/man/man1/ntpq.1
+#usr/share/man/man1/ntpsnmpd.1
+#usr/share/man/man1/sntp.1
 var/ipfire/time/counter.conf
 var/ipfire/time/enable
 var/ipfire/time/settime.conf

diff --git a/config/rootfiles/core/76/filelists/ntp b/config/rootfiles/core/76/filelists/ntp
index c080f383d0d0ba07ec1fbe04004efff6b4450a7d..6adc47bbbc3af11ae421c6709add8a358a801361 100644 (file)
--- a/config/rootfiles/core/76/filelists/ntp
+++ b/config/rootfiles/core/76/filelists/ntp
@@ -1,11 +1,15 @@
 etc/ntp.conf
+usr/bin/ntp-keygen
+usr/bin/ntp-wait
 usr/bin/ntpd
 usr/bin/ntpdate
 usr/bin/ntpdc
+usr/bin/ntpq
+usr/bin/ntptime
+usr/bin/ntptrace
 usr/bin/sntp
-usr/sbin/ntp-keygen
-usr/sbin/ntp-wait
-usr/sbin/ntpq
-usr/sbin/ntptime
-usr/sbin/ntptrace
-usr/sbin/tickadj
+usr/bin/tickadj
+var/ipfire/time/counter.conf
+var/ipfire/time/enable
+var/ipfire/time/settime.conf
+var/ipfire/time/settings

diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index 1b64a7e52c3664d84eba59bc8c5902a911ce0aad..2da9408e25fbdb1bafdc64cb48c4051f880caf65 100644 (file)
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -196,6 +196,14 @@ ln -svf ../run /var/run
 mkdir -p /var/ipfire/firewall
 mkdir -p /var/ipfire/fwhosts
 
+# Remove old ntp binaries
+rm -f /usr/sbin/ntp-keygen
+rm -f /usr/sbin/ntp-wait
+rm -f /usr/sbin/ntpq
+rm -f /usr/sbin/ntptime
+rm -f /usr/sbin/ntptrace
+rm -f /usr/sbin/tickadj
+
 #
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /

diff --git a/lfs/ntp b/lfs/ntp
index 147e0a8f013e3d8467e5499957e5d7f1f10b23ab..a6f7ff6758ecec997844777bb1cf5db48abfba9a 100644 (file)
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
-                       --bindir=/usr/sbin \
                        --sysconfdir=/etc \
                        --disable-nls \
                        --enable-all-clocks \