diff options
| author | Sebastian Schmelzer | 2011-06-09 17:11:03 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-06-09 17:11:03 +0200 |
| commit | 57a88067c45300430a1f3014b7332e40dd41c834 (patch) | |
| tree | 9fa0a47f1fc18893a3675658f51a6a82d5d25c2a | |
| parent | fix path to dropbear binary (diff) | |
| download | core-57a88067c45300430a1f3014b7332e40dd41c834.tar.gz core-57a88067c45300430a1f3014b7332e40dd41c834.tar.xz core-57a88067c45300430a1f3014b7332e40dd41c834.zip | |
QUICKFIX for busybox nbd-client version
| -rwxr-xr-x | src/initramfs/scripts/init | 5 | ||||
| -rw-r--r-- | tools/inc/files.core | 1 | ||||
| -rw-r--r-- | tools/inc/files.share | 1 | ||||
| -rwxr-xr-x | tools/installer | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index b0cd40e1..08374e7c 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -534,7 +534,10 @@ if [ -n "${bldmod}" ] ; then RDEV=/dev/nbd0 waitfor "${RDEV}" 20000 || error "$init_nbddev" i=0 - while ! nbd-client $bldhost $bldport ${RDEV} -persist ; do + # QUICKFIX: busybox version doesn't support "-persist" yet + # but default behaviour is comparable + # OLD CMD: while ! nbd-client $bldhost $bldport ${RDEV} -persist ; do + while ! nbd-client $bldhost $bldport ${RDEV} ; do usleep 100000 i=$(($i + 1)) if [ $i -ge 1000 ] ; then diff --git a/tools/inc/files.core b/tools/inc/files.core index 38961cee..8519e7c8 100644 --- a/tools/inc/files.core +++ b/tools/inc/files.core @@ -2,7 +2,6 @@ f bin/slx* /bin/ f config-db/slx* /bin/ f installer/slx* /bin/ f os-plugins/slx* /bin/ -f tools/uclibc-wrapper /bin/ d lib/OpenSLX /lib/ d boot-env/OpenSLX /lib/ d config-db/OpenSLX /lib/ diff --git a/tools/inc/files.share b/tools/inc/files.share index fb5d42b9..891166f6 100644 --- a/tools/inc/files.share +++ b/tools/inc/files.share @@ -1,6 +1,5 @@ d initramfs/scripts/bin /share/initramfs/ d initramfs/scripts/etc /share/initramfs/ -d initramfs/configs/etc /share/initramfs/ f initramfs/scripts/init /share/initramfs/ d initramfs/tools/hwinfo /share/ramfstools/ d initramfs/tools/mksquashfs /share/ramfstools/ diff --git a/tools/installer b/tools/installer index f974c82c..64f64158 100755 --- a/tools/installer +++ b/tools/installer @@ -451,6 +451,7 @@ build_dpkg_package() echo -e " [${LightGreen}ok${NC}]" + bash mkdir -p $INSTALL_HOME/pkgs/ cp $SLX_DEPBUILD_PATH.deb $INSTALL_HOME/pkgs/$VERSIONSTRING.deb cd $INSTALL_HOME |