SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-08 18:11:41 +00:00
parent b97c2ce374
commit d93a7459f8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
97 changed files with 717 additions and 833 deletions
Download patch file Download diff file Expand all files Collapse all files

8
usr.sbin/rcctl/rcctl.sh
View file

@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: rcctl.sh,v 1.117 2023/07/13 13:54:27 ajacoutot Exp $
# $OpenBSD: rcctl.sh,v 1.119 2024/07/08 14:47:42 ajacoutot Exp $
#
# Copyright (c) 2014, 2015-2022 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@ -127,8 +127,10 @@ rcconf_edit_end()
{
sort -u -o ${_TMP_RCCONF} ${_TMP_RCCONF} || \
rcctl_err "cannot modify ${_TMP_RCCONF}"
cat ${_TMP_RCCONF} >/etc/rc.conf.local || \
rcctl_err "cannot append to /etc/rc.conf.local"
if ! cmp -s ${_TMP_RCCONF} /etc/rc.conf.local; then
install -F -m0644 -o0 -g0 ${_TMP_RCCONF} /etc/rc.conf.local ||
rcctl_err "cannot write to /etc/rc.conf.local"
fi
if [ ! -s /etc/rc.conf.local ]; then
rm /etc/rc.conf.local || \
rcctl_err "cannot remove /etc/rc.conf.local"