Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable the sysv init scripts in OpenBSD build script #5790

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Enable the sysv init scripts in OpenBSD build script #5790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b6a927
fix(openbsd): remove rc_bg="YES" in the sysv init scripts
hcartiaux Oct 6, 2024
7147c76
fix(openbsd): do not rely on rc.local, use the sysv init scripts
hcartiaux Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion sysvinit/openbsd/cloudconfig.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ daemon_user=root

. /etc/rc.d/rc.subr

rc_bg="YES" # (undefined or "YES")
rc_usercheck="YES" # (undefined or "NO")

rc_start() {
Expand Down
1 change: 0 additions & 1 deletion sysvinit/openbsd/cloudfinal.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ daemon_user=root

. /etc/rc.d/rc.subr

rc_bg="YES" # (undefined or "YES")
rc_usercheck="YES" # (undefined or "NO")

rc_start() {
Expand Down
1 change: 0 additions & 1 deletion sysvinit/openbsd/cloudinit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ daemon_user=root

. /etc/rc.d/rc.subr

rc_bg="YES" # (undefined or "YES")
rc_usercheck="YES" # (undefined or "NO")

rc_start() {
Expand Down
1 change: 0 additions & 1 deletion sysvinit/openbsd/cloudinitlocal.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ daemon_user=root

. /etc/rc.d/rc.subr

rc_bg="YES" # (undefined or "YES")
rc_usercheck="YES"

rc_start() {
Expand Down
23 changes: 4 additions & 19 deletions tools/build-on-openbsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,9 @@ else
python3 setup.py install -O1 --distro openbsd --skip-build --init-system sysvinit_openbsd

echo "Installation completed."
RC_LOCAL="/etc/rc.local"
RC_LOCAL_CONTENT="

rm -rf /var/run/cloud-init
/usr/local/lib/cloud-init/ds-identify

cloud-init init --local

cloud-init init

cloud-init modules --mode config

cloud-init modules --mode final
"
if ! test -e $RC_LOCAL; then
echo "export PATH=$PATH:/usr/local/sbin:/usr/local/bin" >> $RC_LOCAL
echo "$RC_LOCAL_CONTENT" >> $RC_LOCAL
elif ! grep -Fq "cloud-init" $RC_LOCAL; then
echo "$RC_LOCAL_CONTENT" >> $RC_LOCAL
fi
rcctl enable cloudinitlocal
rcctl enable cloudinit
rcctl enable cloudconfig
rcctl enable cloudfinal
fi