[PATCH 1/1] meta-isar/isar-image-base: remove uncesessary cmd lines from cfg scripts

[claudius.heine.ext@siemens.com]

From: Claudius Heine <ch@denx.de>

Since we changed to use debootstrap and apt for the installation of
every package, additional runs of 'dpkg configure' and postinst scripts
are no longer necessary.

This removes also the defunct revert of the 'deamon disable steps' used
with the multistrap version of isar and the setting of the root
password, since that should be done in a postinst step of a package
instead.

Signed-off-by: Claudius Heine <ch@denx.de>
---
 .../images/files/debian-configscript.sh            | 26 -----------------
 .../images/files/raspbian-configscript.sh          | 33 ++--------------------
 2 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh
index f2fa2d9..042b530 100755
--- a/meta-isar/recipes-core/images/files/debian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/debian-configscript.sh
@@ -37,19 +37,6 @@ locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
 locales locales/default_environment_locale select en_US.UTF-8
 END
 
-# Set up non-interactive configuration
-export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
-export LC_ALL=C LANGUAGE=C LANG=C
-
-# Run pre installation script
-/var/lib/dpkg/info/dash.preinst install
-
-# Configuring packages
-dpkg --configure -a
-
-# set the root password if that has not been done before
-grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd
-
 cat > /etc/fstab << EOF
 # Begin /etc/fstab
 /dev/$ROOTFS_DEV	/		$ROOTFS_TYPE		defaults		1	1
@@ -76,16 +63,3 @@ fi
 # Purge unused locale and installed packages' .deb files
 localepurge
 apt-get clean
-
-# Undo setup script changes
-if [ -x "$TARGET/sbin/start-stop-daemon.REAL" ]; then
-    mv -f $TARGET/sbin/start-stop-daemon.REAL $TARGET/sbin/start-stop-daemon
-fi
-
-if [ -x "$TARGET/sbin/initctl.REAL" ]; then
-    mv $TARGET/sbin/initctl.REAL $TARGET/sbin/initctl
-fi
-
-if [ -x "$TARGET/sbin/init" -a -x "$TARGET/usr/sbin/policy-rc.d" ]; then
-    rm -f $TARGET/usr/sbin/policy-rc.d
-fi
diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
index 1a85c40..ec05a6b 100644
--- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
@@ -37,23 +37,6 @@ locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
 locales locales/default_environment_locale select en_US.UTF-8
 END
 
-# Set up non-interactive configuration
-export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
-export LC_ALL=C LANGUAGE=C LANG=C
-
-# Run pre installation scripts
-/var/lib/dpkg/info/dash.preinst install
-
-# Prevent removing of boot firmware
-/var/lib/dpkg/info/raspberrypi-bootloader-nokernel.preinst install
-rm /var/lib/dpkg/info/raspberrypi-bootloader-nokernel.postinst
-
-# Configuring packages
-dpkg --configure -a
-
-# set the root password if that has not been done before
-grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd
-
 cat > /etc/fstab << EOF
 # Begin /etc/fstab
 /dev/$ROOTFS_DEV	/		$ROOTFS_TYPE		defaults		1	1
@@ -72,21 +55,11 @@ if [ -f /etc/inittab ]; then
         >> /etc/inittab
 fi
 
-# Undo setup script changes
-if [ -x "$TARGET/sbin/start-stop-daemon.REAL" ]; then
-    mv -f $TARGET/sbin/start-stop-daemon.REAL $TARGET/sbin/start-stop-daemon
-fi
-
-if [ -x "$TARGET/sbin/initctl.REAL" ]; then
-    mv $TARGET/sbin/initctl.REAL $TARGET/sbin/initctl
-fi
-
-if [ -x "$TARGET/sbin/init" -a -x "$TARGET/usr/sbin/policy-rc.d" ]; then
-    rm -f $TARGET/usr/sbin/policy-rc.d
-fi
-
 KERNEL_IMAGE=`ls /boot | grep vmlinuz`
 
 cat > /boot/config.txt << EOF
 kernel=$KERNEL_IMAGE
 EOF
+
+localepurge
+apt-get clean
-- 
2.16.3