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 /tmp | |
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 'tmp')
-rwxr-xr-x | tmp/post_upgrade_command | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index a2fb94e..ed49d0a 100755 --- a/tmp/post_upgrade_command +++ b/tmp/post_upgrade_command @@ -1,6 +1,5 @@ #!/bin/sh -touch /var/run/config.lock /etc/rc.conf_mount_rw KERNELTYPE=`cat /boot/kernel/pfsense_kernel.txt` |