diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-23 17:05:07 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-23 17:52:42 -0300 |
| commit | d4c86857c3bb2b127e3e25671b35487e93ed4194 (patch) | |
| tree | 3397f21f5750a6a0f7a859fde34063d5866b3bc9 /src/usr/local/sbin | |
| parent | 32783770e8cdb6df0368818fa1b7eb0d94431bf6 (diff) | |
| download | pfsense-d4c86857c3bb2b127e3e25671b35487e93ed4194.zip pfsense-d4c86857c3bb2b127e3e25671b35487e93ed4194.tar.gz | |
Verify if pkg is (un)locked before (un)lock it
Diffstat (limited to 'src/usr/local/sbin')
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 978fd83..5325af8 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -134,7 +134,9 @@ _exit() { trap "-" 1 2 15 EXIT if [ -n "${kernel_pkg}" ]; then - _exec "pkg lock ${kernel_pkg}" "Locking kernel package" mute ignore_result + if [ "$(pkg query %k ${kernel_pkg})" = "0" ]; then + _exec "pkg lock ${kernel_pkg}" "Locking kernel package" mute ignore_result + fi fi if [ -f "${pid_file}" ]; then rm -f ${pid_file} @@ -176,7 +178,9 @@ first_step() { if [ "${kernel_version_compare}" = "<" ]; then kernel_update=1 - _exec "pkg unlock ${kernel_pkg}" "Unlocking kernel package" mute ignore_result + if [ "$(pkg query %k ${kernel_pkg})" = "1" ]; then + _exec "pkg unlock ${kernel_pkg}" "Unlocking kernel package" mute ignore_result + fi elif [ "${kernel_version_compare}" = "=" ]; then kernel_update=0 elif [ "${kernel_version_compare}" = ">" ]; then |
