From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 10 Sep 2015 15:50:18 +0000 (+0100)
Subject: Revert "rootfs: Do not uninstall update-rc.d"
X-Git-Tag: 2015-10~494
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5827dd38d75da91d58d28a9f3daa8890f600d196;p=openembedded-core.git

Revert "rootfs: Do not uninstall update-rc.d"

This reverts commit acf90b6c299afe9e9c8fa33c3c6992bfcf40fbbf.

(Reverted to apply the better v2 of the patch)
---

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index ba62273c64..2372226e78 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -240,7 +240,8 @@ class Rootfs(object):
                     pkgs_installed = installed_pkgs.read().splitlines()
                     for pkg_installed in pkgs_installed[:]:
                         pkg = pkg_installed.split()[0]
-                        if pkg in ["base-passwd",
+                        if pkg in ["update-rc.d",
+                                "base-passwd",
                                 "shadow",
                                 "update-alternatives",
                                 self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True)