Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
agent
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
7
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ff3eb58e
authored
Dec 18, 2014
by
Oliver Pinter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workaround FreeBSD default rc.conf.d sourcing, this fixes DHCP issue
parent
e82187a9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
1 deletions
+51
-1
bootstrap-freebsd.sh
+13
-1
bootstrap/freebsd/fix-rc.subr.diff
+38
-0
No files found.
bootstrap-freebsd.sh
View file @
ff3eb58e
...
...
@@ -21,8 +21,20 @@ fi
if
[
!
-d
/root/agent
]
then
cd
/root
git clone https://git
.ik.bme.hu/circle/agent.gi
t
git clone https://git
hub.com/opntr/bme-circle-cloud-agent.git agen
t
fi
cd
/root/agent
grep
"If a service"
/etc/rc.subr
ret
=
$?
if
[
$ret
-eq
0
]
then
echo
"patching /etc/rc.subr ..."
(
cd
/etc
patch
-p1
< /root/agent/bootstrap/freebsd/fix-rc.subr.diff
)
fi
python agent.py
bootstrap/freebsd/fix-rc.subr.diff
0 → 100644
View file @
ff3eb58e
--- /etc/rc.subr.orig 2014-12-18 21:07:36.000000000 +0100
+++ /etc/rc.subr 2014-12-18 21:09:44.000000000 +0100
@@ -1330,24 +1330,17 @@
_rc_conf_loaded=true
fi
- # If a service name was specified, attempt to load
- # service-specific configuration
- if [ -n "$_name" ] ; then
- for _d in /etc ${local_startup%*/rc.d}; do
- if [ -f ${_d}/rc.conf.d/"$_name" ]; then
- debug "Sourcing ${_d}/rc.conf.d/$_name"
- . ${_d}/rc.conf.d/"$_name"
- elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then
- local _rc
- for _rc in ${_d}/rc.conf.d/"$_name"/* ; do
- if [ -f "$_rc" ] ; then
- debug "Sourcing $_rc"
- . "$_rc"
- fi
- done
- fi
- done
- fi
+ for _d in /etc ${local_startup%*/rc.d}; do
+ if [ -d ${_d}/rc.conf.d ] ; then
+ local _rc
+ for _rc in ${_d}/rc.conf.d/* ; do
+ if [ -f "$_rc" ] ; then
+ debug "Sourcing $_rc"
+ . "$_rc"
+ fi
+ done
+ fi
+ done
# Set defaults if defined.
for _var in $rcvar $rcvars; do
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment