In commit 873c1701, the call to "/bin/ls /dev/{$disk}s*" was surrounded
with "escapeshellarg" so the wildcard is not expanded.
Use "glob" to find the slices for a disk instead.
* ppp-ipv6 for PPP type with dhcp6usev4iface (or PPP without dhcp6usev4iface, as dhcp6usev4iface appears to be a no-op on this type of connection)
* rc.newwanip for non-PPP type with dhcp6usev4iface (no change in this commit)
* interface_configure() in all other cases
Use a different flag file to indicate that a package reinstall is
required after a reboot is done first. This avoids the possibility that
the user navigates in the webGUI during the time while the shutdown is
in progress and is accidentally presented with the reinstall all
packages GUI button.
Early in rc.bootup switch the flag file to use its ordinary name, so
that all subsequent code in boot scripts and webGUI will work as it
already does to handle the package reinstall and notifying the user that
a package reinstall is about to be done or in progress...
The generated syslog.conf needs to have the system.log selections combined into a single line in 2 places. The OP on redmine 5606 just showed 1 place in the diff there.
On my system, this gets rid of the duplicated message on login:
php-fpm[11074]: /index.php: Successful login for user 'my.name' from: 10.11.12.13
Note: for some reason old line 848 includes local4.none - but local4.none does not appear in old line 864. What is that about? Is that another different bug?
I did not mess with that, but I noticed that the OPs diff listing did also add in local4.none where it seems to be missing.
Actually this can be fixed by adding just a space after "from any".
The code here builds up $tmprule and each time it adds a new clause it puts a space at the end, ready for if there is another clause to come. The "from any" here was the only offender in this scheme.
It seems good to me to still backport little easy fixes to RELENG_2_2. That way production users can get them easily if they like (with system patches or...).
The fix added for this bug, that check xml file size is < 200 to decide
if file must or not be read created a new issue, single entry is not
showed.
Instead of doing this, check parse_xml_config() return and return empty
array when it's -1
While here, prevent errors saying parse_xml_config() doesn't exist and
make sure xmlparse.inc is required
