Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
86058fb8
Commit
86058fb8
authored
Feb 24, 2015
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename check_reload_status to configd, but keep legacy support for check_reload_status.
parent
32a052f2
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
30 additions
and
17 deletions
+30
-17
rc
src/etc/rc
+6
-3
rc.firmware
src/etc/rc.firmware
+2
-2
Backend.php
src/opnsense/mvc/app/library/OPNsense/Core/Backend.php
+1
-1
check_reload_status.conf
src/opnsense/service/conf/check_reload_status.conf
+2
-2
configd.py
src/opnsense/service/configd.py
+3
-3
execute_command.py
src/opnsense/service/execute_command.py
+12
-2
config.py
src/opnsense/service/modules/config.py
+1
-1
ph_inline_actions.py
src/opnsense/service/modules/ph_inline_actions.py
+1
-1
processhandler.py
src/opnsense/service/modules/processhandler.py
+1
-1
template.py
src/opnsense/service/modules/template.py
+1
-1
No files found.
src/etc/rc
View file @
86058fb8
...
...
@@ -345,9 +345,12 @@ echo "done."
# Run the php.ini setup file
/usr/local/etc/rc.php_ini_setup
chmod
u+rx /usr/local/opnsense/service/check_reload_status.py
/usr/local/opnsense/service/check_reload_status.py
sleep
1
# give check_reload_status some time to load to prevent missing socket
chmod
u+rx /usr/local/opnsense/service/configd.py
/usr/local/opnsense/service/configd.py
# check_reload_status renamed, for legacy stuff symlink old socket
/bin/rm
-f
/var/run/check_reload_status
ln
-s
/var/run/configd.socket /var/run/check_reload_status
sleep
1
# give configd some time to load to prevent missing socket
# let the PHP-based configuration subsystem set up the system now
echo
-n
"Launching the init system..."
...
...
src/etc/rc.firmware
View file @
86058fb8
...
...
@@ -430,10 +430,10 @@ pfSenseupgrade)
rm
/tmp/configbak/
*
_log.txt 2>/dev/null
# tar explode image onto hd
ps
-a
|
grep
"c
heck_reload_status
"
|
awk
'{print $1;}'
|
kill
-9
ps
-a
|
grep
"c
onfigd
"
|
awk
'{print $1;}'
|
kill
-9
echo
"Installing
$IMG
."
>>
/conf/upgrade_log.txt 2>&1
cd
/
&&
/usr/bin/tar
--exclude
=
./dev
-xzUPf
$IMG
>>
/conf/upgrade_log.txt 2>&1
/usr/local/opnsense/service/c
heck_reload_status
.py
/usr/local/opnsense/service/c
onfigd
.py
echo
"Image installed
$IMG
."
>>
/conf/upgrade_log.txt 2>&1
# process custom image if its passed
...
...
src/opnsense/mvc/app/library/OPNsense/Core/Backend.php
View file @
86058fb8
...
...
@@ -38,7 +38,7 @@ class Backend
/**
* @var string location of configd socket
*/
private
$configdSocket
=
"/var/run/c
heck_reload_status
"
;
private
$configdSocket
=
"/var/run/c
onfigd.socket
"
;
/**
* init Backend component
...
...
src/opnsense/service/conf/check_reload_status.conf
View file @
86058fb8
[
main
]
socket_filename
:/
var
/
run
/
c
heck_reload_status
pid_filename
:/
var
/
run
/
c
heck_reload_status
.
pid
socket_filename
:/
var
/
run
/
c
onfigd
.
socket
pid_filename
:/
var
/
run
/
c
onfigd
.
pid
src/opnsense/service/c
heck_reload_status
.py
→
src/opnsense/service/c
onfigd
.py
View file @
86058fb8
...
...
@@ -28,7 +28,7 @@
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------------
package : c
heck_reload_status
package : c
onfigd
function: delivers a process coordinator to handle frontend functions
...
...
@@ -56,12 +56,12 @@ os.chdir(program_path)
# open configuration
cnf
=
ConfigParser
.
ConfigParser
()
cnf
.
read
(
'conf/c
heck_reload_status
.conf'
)
cnf
.
read
(
'conf/c
onfigd
.conf'
)
# validate configuration, exit on missing item
for
config_item
in
[
'socket_filename'
,
'pid_filename'
]:
if
cnf
.
has_section
(
'main'
)
==
False
or
cnf
.
has_option
(
'main'
,
config_item
)
==
False
:
print
(
'configuration item main/
%
s not found in
%
s/conf/c
heck_reload_status
.conf'
%
(
config_item
,
program_path
))
print
(
'configuration item main/
%
s not found in
%
s/conf/c
onfigd
.conf'
%
(
config_item
,
program_path
))
sys
.
exit
(
0
)
# run process coordinator ( on console or as daemon )
...
...
src/opnsense/service/execute_command.py
View file @
86058fb8
...
...
@@ -28,7 +28,7 @@
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------------
package : c
heck_reload_status
package : c
onfigd
function: commandline execute commands to check_reload_status daemon
...
...
@@ -63,6 +63,16 @@ except socket.error, msg:
try
:
print
(
'send:
%
s '
%
exec_command
)
sock
.
send
(
exec_command
)
print
(
'response:
%
s'
%
sock
.
recv
(
4096
))
data
=
[]
while
True
:
line
=
sock
.
recv
(
4096
)
if
line
:
data
.
append
(
line
)
else
:
break
print
(
'response:
%
s'
%
''
.
join
(
data
)
)
finally
:
sock
.
close
()
src/opnsense/service/modules/config.py
View file @
86058fb8
...
...
@@ -27,7 +27,7 @@
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------------
package : c
heck_reload_status
package : c
onfigd
function: config handler
...
...
src/opnsense/service/modules/ph_inline_actions.py
View file @
86058fb8
...
...
@@ -27,7 +27,7 @@
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------------
package : c
heck_reload_status
package : c
onfigd
function: unix domain socket process worker process
...
...
src/opnsense/service/modules/processhandler.py
View file @
86058fb8
...
...
@@ -27,7 +27,7 @@
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------------
package : c
heck_reload_status
package : c
onfigd
function: unix domain socket process worker process
...
...
src/opnsense/service/modules/template.py
View file @
86058fb8
...
...
@@ -27,7 +27,7 @@
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------------
package : c
heck_reload_status
package : c
onfigd
function: template handler, generate configuration files using templates
...
...
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