diff options
| author | Jonathan Bauer | 2015-10-29 13:25:59 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2015-10-29 13:25:59 +0100 |
| commit | f44812d259866c66409f3c373ba2626efae5ec95 (patch) | |
| tree | 00992e6c64d7e9c9fe060a0c6dd7267e1776e76a /remote/rootfs | |
| parent | [cups-freiburg] removed RZMONO2 since it's long dead (diff) | |
| parent | [rootfs-*] Disable 'demo' login, support $SLX_DEMO_PASS to set a password via... (diff) | |
| download | tm-scripts-f44812d259866c66409f3c373ba2626efae5ec95.tar.gz tm-scripts-f44812d259866c66409f3c373ba2626efae5ec95.tar.xz tm-scripts-f44812d259866c66409f3c373ba2626efae5ec95.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 4 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/module.build | 4 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/module.conf | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 9daa6d58..7c66cd11 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -95,6 +95,10 @@ cp -a "/inc/functions" "${FUTURE_ROOT}/opt/openslx/inc/" if [ ! -z "$SLX_ROOT_PASS" ]; then sed -i "s#^root:[^:]*:#root:$SLX_ROOT_PASS:#" "${FUTURE_ROOT}/etc/shadow" fi +# set the SLX_DEMO_PASS if given in config +if [ ! -z "$SLX_DEMO_PASS" ]; then + sed -i "s#^demo:[^:]*:#demo:$SLX_DEMO_PASS:#" "${FUTURE_ROOT}/etc/shadow" +fi # one last debug shell if activated [ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell: before switch_root." diff --git a/remote/rootfs/rootfs-stage32/module.build b/remote/rootfs/rootfs-stage32/module.build index d855f5e5..4fbc26b5 100644 --- a/remote/rootfs/rootfs-stage32/module.build +++ b/remote/rootfs/rootfs-stage32/module.build @@ -104,8 +104,8 @@ post_copy() { add_user "nobody" # setup root account - USER=root add_user - DEMO_ID="$(USER=demo PASSWORD=demo USERHOME=/home/demo USERSHELL=/bin/bash add_user)" + PASSWORD= USER=root add_user + DEMO_ID="$(USER=demo PASSWORD= USERHOME=/home/demo USERSHELL=/bin/bash add_user)" mkdir -p "${TARGET_BUILD_DIR}/root" mkdir -p "${TARGET_BUILD_DIR}/home/demo" diff --git a/remote/rootfs/rootfs-stage32/module.conf b/remote/rootfs/rootfs-stage32/module.conf index e7a9142f..3a671883 100644 --- a/remote/rootfs/rootfs-stage32/module.conf +++ b/remote/rootfs/rootfs-stage32/module.conf @@ -38,6 +38,9 @@ REQUIRED_BINARIES=" getent ldconfig grep + sed + date + cat " REQUIRED_LIBRARIES=" libcap |