diff options
| author | Jonathan Bauer | 2013-11-06 13:55:33 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-11-06 13:55:33 +0100 |
| commit | 3572f215c72a04b05355e36ea9b585041a619090 (patch) | |
| tree | ccb7e36289b94a1d2af9f8b113bb46ff091fa5f8 | |
| parent | [rootfs-stage31] fix plymouthd not finding its theme since we were not (diff) | |
| download | tm-scripts-3572f215c72a04b05355e36ea9b585041a619090.tar.gz tm-scripts-3572f215c72a04b05355e36ea9b585041a619090.tar.xz tm-scripts-3572f215c72a04b05355e36ea9b585041a619090.zip | |
[rootfs-stage31] set the root password in 'bin/activate_sysconfig'
instead of the init directly...
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig | 5 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig index e7ec44be..ca5be6c4 100755 --- a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig @@ -61,6 +61,11 @@ 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 1dd0c108..d69de460 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -96,11 +96,6 @@ 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." |