diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-05-03 10:09:06 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-05-03 10:09:06 +0200 |
| commit | dcb846e3cd1604ec9c0a024b6bd721d306bbce46 (patch) | |
| tree | 49624a702780f2714c9141ead186bfe113043550 /etc/inc/upgrade_config.inc | |
| parent | 03f824a5e540cb32a025b79ddc29baba4d1ea959 (diff) | |
| parent | 8c218e1d0190a218686cf2b65913be3198791206 (diff) | |
| download | pfsense-dcb846e3cd1604ec9c0a024b6bd721d306bbce46.zip pfsense-dcb846e3cd1604ec9c0a024b6bd721d306bbce46.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
usr/local/www/status_rrd_graph_img.php
Diffstat (limited to 'etc/inc/upgrade_config.inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index b3b8fb9..77a8682 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -685,10 +685,6 @@ function upgrade_040_to_041() { $config['sysctl']['item'][13]['descr'] = "Allow unprivileged access to tap(4) device nodes"; $config['sysctl']['item'][13]['value'] = "default"; - $config['sysctl']['item'][14]['tunable'] = "kern.rndtest.verbose"; - $config['sysctl']['item'][14]['descr'] = "Verbosity of the rndtest driver (0: do not display results on console)"; - $config['sysctl']['item'][14]['value'] = "default"; - $config['sysctl']['item'][15]['tunable'] = "kern.randompid"; $config['sysctl']['item'][15]['descr'] = "Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())"; $config['sysctl']['item'][15]['value'] = "default"; |
