From 46a5d3e9634e26ebccede69d9899bc2aa8090902 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 6 Nov 2013 14:00:56 +0100
Subject: [rootfs-stage31] revert: etc/shadow not there yet in
 bin/activate_sysconfig

---
 remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig | 4 ----
 remote/rootfs/rootfs-stage31/data/init                   | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
index ca5be6c4..3e78383e 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
+++ b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
@@ -61,10 +61,6 @@ HEREEND
                 hwclock -s -u
         fi
 
-    # set the SLX_ROOT_PASS if given in config
-    if [ ! -z "$SLX_ROOT_PASS" ]; then
-      sed -i "s/^root:[^:]*:/root:$SLX_ROOT_PASS:/" "${FUTURE_ROOT}/etc/shadow"
-    fi
 
 	tar xf "${CONFIG}.tgz" -C "${FUTURE_ROOT}" || { echo "Could not untar ${CONFIG}.tgz to ${FUTURE_ROOT}"; return 1; }
 }
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index d69de460..1dd0c108 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -96,6 +96,11 @@ fi
 tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/etc/functions.inc" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/"
 #echo 'blacklist pcspkr' >> /mnt/etc/modprobe.d/blacklist.conf
 
+# set the SLX_ROOT_PASS if given in config
+if [ ! -z "$SLX_ROOT_PASS" ]; then
+  sed -i "s/^root:[^:]*:/root:$SLX_ROOT_PASS:/" "${FUTURE_ROOT}/etc/shadow"
+fi
+
 # one last debug shell if activated
 [ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell: before switch_root."
 
-- 
cgit v1.2.3-55-g7522