Use 'mv -f' in rc.d/ntpd to avoid spuriously halting the boot.
The final 'mv' to install a fetched leap-list file can fail (due to a readonly fs, or schg flags, for example), and that leads to mv(1) prompting the user, stopping the boot process. Instead, use mv -f to supress the prompting, and if verbose mode is on, emit a warning that the existing file cannot be replaced. PR: 219255
This commit is contained in:
parent
ab42fbe2e9
commit
6014f3c446
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=335575
@ -148,7 +148,8 @@ ntpd_fetch_leapfile() {
|
|||||||
"$ntp_expiry_tmp" -eq "$ntp_expiry_db" -a \
|
"$ntp_expiry_tmp" -eq "$ntp_expiry_db" -a \
|
||||||
"$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then
|
"$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then
|
||||||
$verbose using $url as $ntp_db_leapfile
|
$verbose using $url as $ntp_db_leapfile
|
||||||
mv $ntp_tmp_leapfile $ntp_db_leapfile
|
mv -f $ntp_tmp_leapfile $ntp_db_leapfile ||
|
||||||
|
$verbose "warning: cannot replace $ntp_db_leapfile (read-only fs?)"
|
||||||
else
|
else
|
||||||
$verbose using existing $ntp_db_leapfile
|
$verbose using existing $ntp_db_leapfile
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user