From 0ec39c2a57987aac871b22dc8f8c38d4329fc70d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Tue, 20 Dec 2016 12:11:27 +0800 Subject: [PATCH 1/2] Fix the code of waiting for ntpd to synchronize in genessis --- xCAT-genesis-scripts/bin/doxcat | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/bin/doxcat index 6a637fb91..0f39e1e89 100755 --- a/xCAT-genesis-scripts/bin/doxcat +++ b/xCAT-genesis-scripts/bin/doxcat @@ -266,18 +266,18 @@ ip addr show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|grep -v inet6| logger -s -t $log_label -p local4.info "Starting ntpd..." ntpd -g -x -if [ -e "/dev/rtc" ]; then - logger -s -t $log_label -p local4.info "Attempting to sync hardware clock..." - ( sleep 8 ; hwclock --systohc ) /dev/null 2>&1 & - disown +logger -s -t $log_label -p local4.info "Waiting for ntpd to synchronize..." +ntp-wait -n 1999 -s 1 -v +if [ $? -ne 0 ] +then + logger -s -t $log_label -p local4.info "... ntpd did not synchronize." fi -# rv 0 state does not work with the new ntp versions -logger -s -t $log_label -p local4.info "Checking ntpq for the offset values..." -while [ "`ntpq -c 'rv 0 offset' | awk -F '=' '/offset=/ { print $2 }' | awk -F '.' '{ print $1 }' | sed s/-//`" -ge 1000 ]; do - sleep 1 -done -logger -s -t $log_label -p local4.info "Checking ntpq for the offset values... Done" +if [ -e "/dev/rtc" ]; then + logger -s -t $log_label -p local4.info "Attempting to sync hardware clock..." + ( hwclock --systohc ) /dev/null 2>&1 & + disown +fi logger -s -t $log_label -p local4.info "Restarting syslog..." read -r RSYSLOG_PID /dev/null From 0044749f338965dbbc100519754cdcafdd5b0bbd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Tue, 20 Dec 2016 12:54:15 +0800 Subject: [PATCH 2/2] Add command ntp-wait into package xCAT-genesis-base --- xCAT-genesis-builder/install | 2 +- xCAT-genesis-builder/install.ubuntu | 2 +- xCAT-genesis-builder/xCAT-genesis-base.spec | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install index 67e6950fa..2f1d0507f 100755 --- a/xCAT-genesis-builder/install +++ b/xCAT-genesis-builder/install @@ -9,7 +9,7 @@ dracut_install efibootmgr #dracut_install libvirtd /usr/share/libvirt/cpu_map.xml /usr/bin/qemu-img /usr/libexec/qemu-kvm dracut_install mkswap df brctl vconfig ifenslave ssh-keygen scp clear dhclient lldpad dracut_install lldptool /lib64/libnss_dns-2.12.so /lib64/libnss_dns.so.2 -dracut_install poweroff ntpq ntpd hwclock date /usr/share/terminfo/x/xterm /usr/share/terminfo/s/screen /etc/nsswitch.conf /etc/services +dracut_install poweroff ntpq ntpd ntp-wait hwclock date /usr/share/terminfo/x/xterm /usr/share/terminfo/s/screen /etc/nsswitch.conf /etc/services dracut_install /sbin/rsyslogd /etc/protocols umount /bin/rpm /usr/lib/rpm/rpmrc dracut_install chmod /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /lib/libm.so.6 /sbin/route /sbin/ifconfig /usr/bin/whoami /usr/bin/head /usr/bin/tail basename /etc/redhat-release ping tr lsusb /usr/share/hwdata/usb.ids #ibm fw wrapper requirements dracut_install dmidecode /usr/lib64/libstdc++.so.6 #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si diff --git a/xCAT-genesis-builder/install.ubuntu b/xCAT-genesis-builder/install.ubuntu index 9ae3f5af2..f073efff0 100755 --- a/xCAT-genesis-builder/install.ubuntu +++ b/xCAT-genesis-builder/install.ubuntu @@ -10,7 +10,7 @@ dracut_install efibootmgr #dracut_install libvirtd /usr/share/libvirt/cpu_map.xml /usr/bin/qemu-img /usr/libexec/qemu-kvm dracut_install mkswap df brctl vconfig ifenslave ssh-keygen scp clear dhclient lldpad dracut_install lldptool -dracut_install poweroff ntpq ntpd hwclock date /usr/share/terminfo/x/xterms /etc/nsswitch.conf /etc/services +dracut_install poweroff ntpq ntp-wait ntpd hwclock date /usr/share/terminfo/x/xterms /etc/nsswitch.conf /etc/services dracut_install /usr/sbin/rsyslogd /etc/protocols umount /usr/bin/dpkg /usr/bin/rpm /usr/lib/rpm/rpmrc if [ -n $version12 ];then dracut_install /lib/x86_64-linux-gnu/libnss_dns-2.15.so /lib/x86_64-linux-gnu/libnss_dns.so.2 diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec index 989980591..9d8c7907f 100755 --- a/xCAT-genesis-builder/xCAT-genesis-base.spec +++ b/xCAT-genesis-builder/xCAT-genesis-base.spec @@ -31,6 +31,7 @@ URL: http://xcat.org Source1: xCAT-genesis-base-%{tarch}.tar.bz2 Buildroot: %{_localstatedir}/tmp/xCAT-genesis +BuildRequires: /usr/sbin/ntp-wait Packager: IBM Corp. %Description