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
11f56521
Commit
11f56521
authored
Dec 26, 2014
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://github.com/opnsense/core
parents
bb55bc37
e28efdc5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
6 deletions
+20
-6
Makefile
Makefile
+4
-2
pkg_upgrade.sh
src/opnsense/scripts/pkg_upgrade.sh
+15
-3
system_firmware_check.php
src/www/system_firmware_check.php
+1
-1
No files found.
Makefile
View file @
11f56521
...
...
@@ -7,8 +7,10 @@ umount:
umount
-f
"<above>:
${
.CURDIR
}
/src"
install
:
mkdir
-p
${
DESTDIR
}
/usr/local
cp
-r
${
.CURDIR
}
/src/
*
${
DESTDIR
}
/usr/local
@
mkdir
-p
${
DESTDIR
}
/usr/local
@
cp
-r
${
.CURDIR
}
/src/
*
${
DESTDIR
}
/usr/local
@
(
cd
${
.CURDIR
}
/src
;
find
*
-type
f
)
|
\
xargs
-n1
printf
"/usr/local/%s
\n
"
lint
:
find
${
.CURDIR
}
/src
-name
"*.class"
-print0
| xargs
-0
-n1
php
-l
...
...
src/opnsense/scripts/pkg_upgrade.sh
View file @
11f56521
#!/bin/sh
pkg upgrade
-y
>
/tmp/pkg_upgrade.progress &
echo
'***DONE***'
>>
/tmp/pkg_upgrade.progress
rm
/tmp/pkg_upgrade.progress
pkg_running
=
`
ps
-x
|
grep
"pkg "
|
grep
-v
"grep"
`
if
[
"
$pkg_running
"
==
""
]
;
then
if
[
-f
/tmp/pkg_upgrade.progress
]
;
then
# Remove leftovers from previous upgrade first
rm
/tmp/pkg_upgrade.progress
fi
# start pkg upgrade
pkg upgrade
-y
>
/tmp/pkg_upgrade.progress
echo
'***DONE***'
>>
/tmp/pkg_upgrade.progress
else
echo
'Upgrade already in progress'
echo
'***DONE***'
fi
src/www/system_firmware_check.php
View file @
11f56521
...
...
@@ -52,7 +52,7 @@ if($_POST['action'] == 'pkg_upgrade') {
$shell_output
=
array
();
$shell
=
new
Core\Shell
();
// execute shell command and collect (only valid) info into named array
$shell
->
exec
(
"/usr/local/opnsense/scripts/pkg_upgrade.sh
&"
,
false
,
false
,
$shell_output
);
$shell
->
exec
(
"/usr/local/opnsense/scripts/pkg_upgrade.sh&"
,
false
,
false
,
$shell_output
);
}
if
(
$_POST
[
'action'
]
==
'update_status'
)
{
...
...
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