From cf42de70c84632bcee5d6d545b1242f14a73c618 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Wed, 5 Jan 2011 16:22:06 -0500 Subject: Swoop through and stop any packages prior to upgrade. Ticket #1156 --- tmp/pre_upgrade_command | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tmp') diff --git a/tmp/pre_upgrade_command b/tmp/pre_upgrade_command index 3eabc5f..5cad8b5 100644 --- a/tmp/pre_upgrade_command +++ b/tmp/pre_upgrade_command @@ -2,6 +2,11 @@ /etc/rc.conf_mount_rw +# Stop any packages prior to upgrade +for FILE in /usr/local/etc/rc.d/*.sh; do + $FILE stop +done + # Record the previous version PRIOR_VERSION=`uname -r | cut -d'.' -f1` echo $PRIOR_VERSION > /tmp/pre_upgrade_version -- cgit v1.1 From fe868e1d9d6fafc323356ab3422a00d415756e6b Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Wed, 5 Jan 2011 16:28:31 -0500 Subject: Revert "Swoop through and stop any packages prior to upgrade. Ticket #1156" This reverts commit cf42de70c84632bcee5d6d545b1242f14a73c618. --- tmp/pre_upgrade_command | 5 ----- 1 file changed, 5 deletions(-) (limited to 'tmp') diff --git a/tmp/pre_upgrade_command b/tmp/pre_upgrade_command index 5cad8b5..3eabc5f 100644 --- a/tmp/pre_upgrade_command +++ b/tmp/pre_upgrade_command @@ -2,11 +2,6 @@ /etc/rc.conf_mount_rw -# Stop any packages prior to upgrade -for FILE in /usr/local/etc/rc.d/*.sh; do - $FILE stop -done - # Record the previous version PRIOR_VERSION=`uname -r | cut -d'.' -f1` echo $PRIOR_VERSION > /tmp/pre_upgrade_version -- cgit v1.1 From 7201ca277ed66540baea26ff26ea339ceb15ac9b Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 12 Jan 2011 14:23:39 -0500 Subject: We no longer use /var/run/config.lock - catch up to other progress. Also, use lockf to test if the config is locked now, with a 30 second timeout. --- tmp/post_upgrade_command | 1 - 1 file changed, 1 deletion(-) (limited to 'tmp') 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` -- cgit v1.1