diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
| commit | 1f74cd2d101f032472a4968a10b64161652d6c1f (patch) | |
| tree | d692513243aaed6003264f0b877b50cbeb69328b /etc/rc.shutdown | |
| parent | c9d174dfc0a29c59ae35f43a470460f36f695b61 (diff) | |
| parent | 96e889fc1e938187dd18238d80e3163e1aca3006 (diff) | |
| download | pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.zip pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/interfaces.inc
etc/inc/system.inc
Diffstat (limited to 'etc/rc.shutdown')
| -rwxr-xr-x | etc/rc.shutdown | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.shutdown b/etc/rc.shutdown index 257a577..9d46ad2 100755 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -1,7 +1,7 @@ #!/bin/sh -if [ -f /var/run/config.lock ]; then - echo "Cannot reboot at this moment, a config write operation is in progress." +if ! /usr/bin/lockf -s -t 30 /tmp/config.lock /usr/bin/true; then + echo "Cannot shutdown at this moment, a config write operation is in progress and 30 seconds have passed." exit -1 fi |
