Commit 585007d4 authored by Mike Hibler's avatar Mike Hibler

Blew the ntp.conf fixup in slicefix, now it should work.

See Mike thrash. Thrash Mike, thrash!
parent 03ea0735
......@@ -147,15 +147,12 @@ localize_image() {
# Check the NTP configuration.
if [ -e /etc/ntp.conf ]; then
cmp -s /etc/ntp.conf $MNT/etc/ntp.conf
if [ $? -ne 0 ]; then
echo " updating /etc/ntp.conf"
echo " updating /etc/ntp.conf"
cp -pf /etc/ntp.conf $MNT/etc/ntp.conf || {
echo "Failed to create /etc/ntp.conf"
return 1
}
fi
cp -pf /etc/ntp.conf $MNT/etc/ntp.conf || {
echo "Failed to create /etc/ntp.conf"
return 1
}
# XXX cannot put drift in /etc/ntp.drift on Linux
if [ -d "$MNT/var/lib/ntp" ]; then
......
......@@ -1248,22 +1248,19 @@ sub localize
# Check the NTP configuration.
if (-e "/etc/ntp.conf") {
system("cmp -s /etc/ntp.conf $imageroot/etc/ntp.conf >/dev/null 2>&1");
if ($?) {
print "Updating /etc/ntp.conf\n";
print "Updating /etc/ntp.conf\n";
system("cp -pf /etc/ntp.conf $imageroot/etc/ntp.conf");
if ($?) {
print STDERR "Failed to create /etc/ntp.conf\n";
return;
}
system("cp -pf /etc/ntp.conf $imageroot/etc/ntp.conf");
if ($?) {
print STDERR "Failed to create /etc/ntp.conf\n";
return;
}
# XXX cannot use /etc/ntp.drift for Linux
if (-d "/var/lib/ntp") {
file_replace_string($imageroot, "/etc/ntp.conf",
"/etc/ntp.drift",
"/var/lib/ntp/ntp.drift");
}
# XXX cannot use /etc/ntp.drift for Linux
if (-d "$imageroot/var/lib/ntp") {
file_replace_string($imageroot, "/etc/ntp.conf",
"/etc/ntp.drift",
"/var/lib/ntp/ntp.drift");
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment