rc: moving from i386 to amd64 or vice versa doesn't work

Packages are not part of the base so they stay the same bricking
the installation completely.  If you need to pull off such a stunt,
please use the install media plus config importer--it's cleaner.
This commit is contained in:
Franco Fichtner 2015-03-30 17:25:04 +02:00
parent c6240d38f8
commit 6922e35e95
4 changed files with 12 additions and 26 deletions

View File

@ -321,10 +321,11 @@ enable_watchdog();
/* if we are operating at 1000 then increase timeouts.
this was never accounted for after moving to 1000 hz */
$kern_hz = get_single_sysctl('kern.clockrate');
$kern_hz = substr($kern_hz, strpos($kern_hz, "hz = ") + 5);
$kern_hz = substr($kern_hz, 0, strpos($kern_hz, ","));
if($kern_hz == "1000")
set_single_sysctl("net.inet.tcp.rexmit_min" , "30");
$kern_hz = substr($kern_hz, strpos($kern_hz, 'hz = ') + 5);
$kern_hz = substr($kern_hz, 0, strpos($kern_hz, ','));
if ($kern_hz == '1000') {
set_single_sysctl('net.inet.tcp.rexmit_min' , '30');
}
/* start the igmpproxy daemon */
services_igmpproxy_configure();
@ -338,16 +339,13 @@ activate_powerd();
/* Set preferred protocol */
prefer_ipv4_or_ipv6();
/* Remove the old shutdown binary if we kept it. */
if (file_exists("/sbin/shutdown.old"))
@unlink("/sbin/shutdown.old");
/* Give syslogd a kick after everything else has been initialized, otherwise it can occasionally
fail to route syslog messages properly on both IPv4 and IPv6 */
/*
* Give syslogd a kick after everything else has been
* initialized, otherwise it can occasionally fail to
* route syslog messages properly on both IPv4 and IPv6.
*/
system_syslogd_start();
/* If there are ipsec dynamic hosts try again to reload the tunnels as rc.newipsecdns does */
if ($ipsec_dynamic_hosts) {
vpn_ipsec_configure();

View File

@ -8,9 +8,4 @@ fi
/usr/local/etc/rc.backup_rrd
/usr/local/etc/rc.backup_dhcpleases
SHUTDOWN=/sbin/shutdown
if [ -f /sbin/shutdown.old ]; then
SHUTDOWN=/sbin/shutdown.old
fi
${SHUTDOWN} -op now
/sbin/shutdown -op now

View File

@ -53,8 +53,6 @@ echo
# if we can update base, we'll do that as well
if opnsense-update -c; then
# apparently, this is for moving between amd64 <-> i386
cp -p /sbin/shutdown /sbin/shutdown.old
opnsense-update && /usr/local/etc/rc.reboot
else
opnsense-update

View File

@ -8,9 +8,4 @@ fi
/usr/local/etc/rc.backup_rrd
/usr/local/etc/rc.backup_dhcpleases
SHUTDOWN=/sbin/shutdown
if [ -f /sbin/shutdown.old ]; then
SHUTDOWN=/sbin/shutdown.old
fi
${SHUTDOWN} -or now
/sbin/shutdown -or now