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
2c03711a
Commit
2c03711a
authored
Mar 15, 2015
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix config restore / remove package code from backup/restore
parent
308122b3
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
153 deletions
+17
-153
viconfig
src/bin/viconfig
+0
-1
config.lib.inc
src/etc/inc/config.lib.inc
+1
-2
globals.inc
src/etc/inc/globals.inc
+0
-1
pfsense-utils.inc
src/etc/inc/pfsense-utils.inc
+0
-1
rc
src/etc/rc
+0
-3
diag_backup.php
src/www/diag_backup.php
+16
-140
firewall_nat.php
src/www/firewall_nat.php
+0
-1
interfaces.php
src/www/interfaces.php
+0
-1
interfaces_assign.php
src/www/interfaces_assign.php
+0
-3
No files found.
src/bin/viconfig
View file @
2c03711a
#!/bin/sh
#!/bin/sh
vi /conf/config.xml
vi /conf/config.xml
rm
/tmp/config.cache
src/etc/inc/config.lib.inc
View file @
2c03711a
...
@@ -34,7 +34,7 @@ require_once("script/load_phalcon.php");
...
@@ -34,7 +34,7 @@ require_once("script/load_phalcon.php");
/****f* config/parse_config
/****f* config/parse_config
* NAME
* NAME
* parse_config - Read in config.
cache or config.
xml if needed and return $config array
* parse_config - Read in config.xml if needed and return $config array
* RESULT
* RESULT
* $config - array containing all configuration variables
* $config - array containing all configuration variables
******/
******/
...
@@ -272,7 +272,6 @@ function reset_factory_defaults($lock = false)
...
@@ -272,7 +272,6 @@ function reset_factory_defaults($lock = false)
}
}
}
}
closedir
(
$dh
);
closedir
(
$dh
);
unlink_if_exists
(
'/tmp/config.cache'
);
/* copy default configuration */
/* copy default configuration */
copy
(
'/usr/local/etc/config.xml'
,
'/conf/config.xml'
);
copy
(
'/usr/local/etc/config.xml'
,
'/conf/config.xml'
);
...
...
src/etc/inc/globals.inc
View file @
2c03711a
...
@@ -44,7 +44,6 @@ $g = array(
...
@@ -44,7 +44,6 @@ $g = array(
"vardb_path"
=>
"/var/db"
,
"vardb_path"
=>
"/var/db"
,
"varlog_path"
=>
"/var/log"
,
"varlog_path"
=>
"/var/log"
,
"tmp_path"
=>
"/tmp"
,
"tmp_path"
=>
"/tmp"
,
"xml_rootobj"
=>
"pfsense"
,
"admin_group"
=>
"admins"
,
"admin_group"
=>
"admins"
,
"product_name"
=>
"OPNsense"
,
"product_name"
=>
"OPNsense"
,
"product_copyright"
=>
"Deciso B.V."
,
"product_copyright"
=>
"Deciso B.V."
,
...
...
src/etc/inc/pfsense-utils.inc
View file @
2c03711a
...
@@ -495,7 +495,6 @@ function restore_config_section($section_name, $new_contents)
...
@@ -495,7 +495,6 @@ function restore_config_section($section_name, $new_contents)
}
}
$config
[
$section_name
]
=
&
$section_xml
;
$config
[
$section_name
]
=
&
$section_xml
;
@
unlink
(
'/tmp/config.cache'
);
write_config
(
sprintf
(
gettext
(
"Restored %s of config file (maybe from CARP partner)"
),
$section_name
));
write_config
(
sprintf
(
gettext
(
"Restored %s of config file (maybe from CARP partner)"
),
$section_name
));
disable_security_checks
();
disable_security_checks
();
...
...
src/etc/rc
View file @
2c03711a
...
@@ -372,9 +372,6 @@ fi
...
@@ -372,9 +372,6 @@ fi
/usr/local/bin/beep.sh start 2>&1
>
/dev/null
/usr/local/bin/beep.sh start 2>&1
>
/dev/null
# Reset the cache. read-only requires this.
/bin/rm
-f
/tmp/config.cache
/usr/local/etc/rc.initial.banner
/usr/local/etc/rc.initial.banner
exit
0
exit
0
src/www/diag_backup.php
View file @
2c03711a
This diff is collapsed.
Click to expand it.
src/www/firewall_nat.php
View file @
2c03711a
...
@@ -55,7 +55,6 @@ if ($_POST) {
...
@@ -55,7 +55,6 @@ if ($_POST) {
$retval
=
0
;
$retval
=
0
;
unlink_if_exists
(
"/tmp/config.cache"
);
$retval
|=
filter_configure
();
$retval
|=
filter_configure
();
$savemsg
=
get_std_save_message
(
$retval
);
$savemsg
=
get_std_save_message
(
$retval
);
...
...
src/www/interfaces.php
View file @
2c03711a
...
@@ -399,7 +399,6 @@ if ($_POST['apply']) {
...
@@ -399,7 +399,6 @@ if ($_POST['apply']) {
if
(
!
is_subsystem_dirty
(
'interfaces'
))
if
(
!
is_subsystem_dirty
(
'interfaces'
))
$intput_errors
[]
=
gettext
(
"You have already applied your settings!"
);
$intput_errors
[]
=
gettext
(
"You have already applied your settings!"
);
else
{
else
{
unlink_if_exists
(
"
{
$g
[
'tmp_path'
]
}
/config.cache"
);
clear_subsystem_dirty
(
'interfaces'
);
clear_subsystem_dirty
(
'interfaces'
);
if
(
file_exists
(
"
{
$g
[
'tmp_path'
]
}
/.interfaces.apply"
))
{
if
(
file_exists
(
"
{
$g
[
'tmp_path'
]
}
/.interfaces.apply"
))
{
...
...
src/www/interfaces_assign.php
View file @
2c03711a
...
@@ -212,9 +212,6 @@ if (isset($_POST['add_x']) && isset($_POST['if_add'])) {
...
@@ -212,9 +212,6 @@ if (isset($_POST['add_x']) && isset($_POST['if_add'])) {
uksort
(
$config
[
'interfaces'
],
"compare_interface_friendly_names"
);
uksort
(
$config
[
'interfaces'
],
"compare_interface_friendly_names"
);
/* XXX: Do not remove this. */
unlink_if_exists
(
"
{
$g
[
'tmp_path'
]
}
/config.cache"
);
write_config
();
write_config
();
$savemsg
=
gettext
(
"Interface has been added."
);
$savemsg
=
gettext
(
"Interface has been added."
);
...
...
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