|
@@ -4774,10 +4774,10 @@ function time_synchronisation {
|
4774
|
4774
|
echo '# File which contains the previous date as a string' >> /usr/bin/updatedate
|
4775
|
4775
|
echo 'BEFORE_FULLDATE_FILE=/var/log/tlsdate.txt' >> /usr/bin/updatedate
|
4776
|
4776
|
echo 'DATE_BEFORE=$(date)' >> /usr/bin/updatedate
|
4777
|
|
- echo 'BEFORE=$(date -d "$Y-$M-$D" "+%s")' >> /usr/bin/updatedate
|
|
4777
|
+ echo 'BEFORE=$(date +%Y-%M-%D)' >> /usr/bin/updatedate
|
4778
|
4778
|
echo 'BACKWARDS_BETWEEN=0' >> /usr/bin/updatedate
|
4779
|
4779
|
echo '# If the date was previously set' >> /usr/bin/updatedate
|
4780
|
|
- echo 'if [ -f "$BEFORE_DATE_FILE" ]; then' >> /usr/bin/updatedate
|
|
4780
|
+ echo 'if [ -s "$BEFORE_DATE_FILE" ]; then' >> /usr/bin/updatedate
|
4781
|
4781
|
echo ' BEFORE_FILE=$(cat $BEFORE_DATE_FILE)' >> /usr/bin/updatedate
|
4782
|
4782
|
echo ' BEFORE_FULLDATE=$(cat $BEFORE_FULLDATE_FILE)' >> /usr/bin/updatedate
|
4783
|
4783
|
echo ' # is the date going backwards?' >> /usr/bin/updatedate
|
|
@@ -4797,7 +4797,7 @@ function time_synchronisation {
|
4797
|
4797
|
echo '# Set the date' >> /usr/bin/updatedate
|
4798
|
4798
|
echo '/usr/bin/timeout $TIMEOUT tlsdate -l -t -H $TIMESOURCE -p 443 >> $LOGFILE' >> /usr/bin/updatedate
|
4799
|
4799
|
echo 'DATE_AFTER=$(date)' >> /usr/bin/updatedate
|
4800
|
|
- echo 'AFTER=$(date -d "$Y-$M-$D" '+%s')' >> /usr/bin/updatedate
|
|
4800
|
+ echo 'AFTER=$(date +%Y-%M-%D)' >> /usr/bin/updatedate
|
4801
|
4801
|
echo '# After setting the date did it go backwards?' >> /usr/bin/updatedate
|
4802
|
4802
|
echo 'if (( $AFTER < $BEFORE )); then' >> /usr/bin/updatedate
|
4803
|
4803
|
echo ' echo "Incorrect date: $DATE_BEFORE -> $DATE_AFTER" >> $LOGFILE' >> /usr/bin/updatedate
|
|
@@ -4806,10 +4806,10 @@ function time_synchronisation {
|
4806
|
4806
|
echo ' # Try resetting the date from another time source' >> /usr/bin/updatedate
|
4807
|
4807
|
echo ' /usr/bin/timeout $TIMEOUT tlsdate -l -t -H $TIMESOURCE2 -p 443 >> $LOGFILE' >> /usr/bin/updatedate
|
4808
|
4808
|
echo ' DATE_AFTER=$(date)' >> /usr/bin/updatedate
|
4809
|
|
- echo ' AFTER=$(date -d "$Y-$M-$D" "+%s")' >> /usr/bin/updatedate
|
|
4809
|
+ echo ' AFTER=$(date +%Y-%M-%D)' >> /usr/bin/updatedate
|
4810
|
4810
|
echo 'else' >> /usr/bin/updatedate
|
4811
|
4811
|
echo ' echo -n $TIMESOURCE >> $LOGFILE' >> /usr/bin/updatedate
|
4812
|
|
- echo ' if [ -f "$BEFORE_DATE_FILE" ]; then' >> /usr/bin/updatedate
|
|
4812
|
+ echo ' if [ -s "$BEFORE_DATE_FILE" ]; then' >> /usr/bin/updatedate
|
4813
|
4813
|
echo ' echo -n " " >> $LOGFILE' >> /usr/bin/updatedate
|
4814
|
4814
|
echo ' echo -n $BEFORE_FILE >> $LOGFILE' >> /usr/bin/updatedate
|
4815
|
4815
|
echo ' fi' >> /usr/bin/updatedate
|