core90: work around dhcp client hang at shutdown after update.

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 90 / update.sh

diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 52a8a8c757a944ede78d9525ad603d98b7362928..e57bc17f9ee4c8cd7a764cb7948e352556ceb620 100644 (file)
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -211,6 +211,10 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 # Remove old udev configuration
 rm -vf /etc/udev/rules.d/30-persistent-network.rules
 
+# Remove pids from dhcp client because it hang at normal shutdown
+# so let the sysvinit kill it
+rm -f /run/dhcpcd-*.pid
+
 #
 # Start services
 #
@@ -261,9 +265,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
+               rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null
        fi
 fi