diff options
| author | Simon Rettberg | 2013-05-14 18:54:48 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-14 18:54:48 +0200 |
| commit | 362fbbb7c888e125b0270eda89878859eac0e3f4 (patch) | |
| tree | 67eb9d52db7d7aa9ce306ccb4f464cd7c275b378 /remote/rootfs | |
| parent | pxelinux.0 (diff) | |
| parent | change ipxe source (diff) | |
| download | tm-scripts-362fbbb7c888e125b0270eda89878859eac0e3f4.tar.gz tm-scripts-362fbbb7c888e125b0270eda89878859eac0e3f4.tar.xz tm-scripts-362fbbb7c888e125b0270eda89878859eac0e3f4.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ | 2 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.build | 5 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ index 256c6f49..f3d7d4c2 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ @@ -7,4 +7,4 @@ NET_IP=$(ip addr show dev ${NET_IF} | grep "inet " | awk -F " " '{print $2}' | a UDHCPC_OPTS="" [ ! -z "$NET_IP" ] && UDHCPC_OPTS=" -r $NET_IP " -/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i $NET_IF +/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/openslx/udhcpc.openslx.script -i $NET_IF diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 7d639450..0ca8d64c 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -93,8 +93,11 @@ post_copy() { # setup root accoun USER=root PASSWORD='!r00t' add_user + DEMO_ID="$(USER=demo PASSWORD=demo USERHOME=/home/demo USERSHELL=/bin/bash add_user)" - mkdir -p ${TARGET_BUILD_DIR}/root + mkdir -p "${TARGET_BUILD_DIR}/root" + mkdir -p "${TARGET_BUILD_DIR}/home/demo" + chown "$DEMO_ID:$DEMO_ID" "${TARGET_BUILD_DIR}/home/demo" echo "minilinux-$(hostname)" > "${TARGET_BUILD_DIR}/etc/hostname" # check for kernel modules, if not present copy from system diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index a34634ab..a8bbf386 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -27,7 +27,8 @@ REQUIRED_BINARIES=" bash xterm ckbcomp xvidtune - bc" + bc + dirname" REQUIRED_LIBRARIES=" libcap libcidn libcom_err |