diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-29 12:13:46 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-29 12:13:46 -0200 |
| commit | 016a0b252eaa4dcbc6c09142393b3d1e16f49908 (patch) | |
| tree | aa73425afe6857bbe2fa2b204f506fa4d745fda2 /src/etc | |
| parent | b9e0e4206d3e06addef82e6cd69bf591170409f9 (diff) | |
| download | pfsense-016a0b252eaa4dcbc6c09142393b3d1e16f49908.zip pfsense-016a0b252eaa4dcbc6c09142393b3d1e16f49908.tar.gz | |
Remove old hacks used to upgrade from 2.1 to 2.2
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/pfSense.obsoletedfiles | 1 | ||||
| -rwxr-xr-x | src/etc/rc.bootup | 5 | ||||
| -rwxr-xr-x | src/etc/rc.reboot | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles index b6135af..cb649d5 100644 --- a/src/etc/pfSense.obsoletedfiles +++ b/src/etc/pfSense.obsoletedfiles @@ -218,6 +218,7 @@ /sbin/mount_oldnfs /sbin/mount_procfs /sbin/ppp-script +/sbin/shutdown.old /scripts/dev_bootstrap.sh /tmp/post_upgrade_command /tmp/post_upgrade_command.php diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index 22a2316..5629102 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -347,11 +347,6 @@ 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"); -} - /* Resync / Reinstall packages if need be */ if (file_exists('/conf/needs_package_sync')) { mark_subsystem_dirty('packagelock'); diff --git a/src/etc/rc.reboot b/src/etc/rc.reboot index f795dec..5acf81a 100755 --- a/src/etc/rc.reboot +++ b/src/etc/rc.reboot @@ -44,8 +44,4 @@ fi sleep 1 SHUTDOWN=/sbin/shutdown -if [ -f /sbin/shutdown.old ]; then - SHUTDOWN=/sbin/shutdown.old -fi - $SHUTDOWN -r now |
