diff options
| author | Simon Rettberg | 2013-05-14 17:06:07 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-14 17:06:07 +0200 |
| commit | 746d2e776da606668890164634ea77456bf62f90 (patch) | |
| tree | 603607a65a0d9c500dae07c4a0597089ee8d80b9 /remote/rootfs | |
| parent | [vmplayer] +x on /usr/bin/* (diff) | |
| parent | Merge branch 'master' of git:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-746d2e776da606668890164634ea77456bf62f90.tar.gz tm-scripts-746d2e776da606668890164634ea77456bf62f90.tar.xz tm-scripts-746d2e776da606668890164634ea77456bf62f90.zip | |
Merge branch 'master' of simonslx: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 | 3 |
2 files changed, 4 insertions, 1 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 bbd88a7e..0ca8d64c 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -62,6 +62,9 @@ post_copy() { # make basic directory structure mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,opt/openslx/mnt} + # make openslx log directory + mkdir -p "${TARGET_BUILD_DIR}"/var/log/openslx + # copy devices from running system cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \ "${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed." |