Merge pull request #4464 from antonlacon/le10-revert-bb-usleep

Return usleep to busybox init
This commit is contained in:
Christian Hewitt 2020-06-29 09:16:10 +04:00 committed by GitHub
commit d0f7212638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.32.0.git # Busybox version: 1.32.0.git
# Fri Jun 26 21:30:52 2020 # Sun Feb 2 19:50:06 2020
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -329,7 +329,7 @@ CONFIG_UNAME_OSNAME="GNU/Linux"
# CONFIG_BB_ARCH is not set # CONFIG_BB_ARCH is not set
# CONFIG_UNIQ is not set # CONFIG_UNIQ is not set
# CONFIG_UNLINK is not set # CONFIG_UNLINK is not set
# CONFIG_USLEEP is not set CONFIG_USLEEP=y
# CONFIG_UUDECODE is not set # CONFIG_UUDECODE is not set
# CONFIG_BASE64 is not set # CONFIG_BASE64 is not set
# CONFIG_UUENCODE is not set # CONFIG_UUENCODE is not set

View File

@ -111,7 +111,7 @@ mount_common() {
mount $MOUNT_OPTIONS $1 $2 >&$SILENT_OUT 2>&1 mount $MOUNT_OPTIONS $1 $2 >&$SILENT_OUT 2>&1
[ "$?" -eq "0" ] && ERR_ENV=0 && break [ "$?" -eq "0" ] && ERR_ENV=0 && break
sleep 1 usleep 1000000
done done
[ "$ERR_ENV" -eq "0" ] && return 0 [ "$ERR_ENV" -eq "0" ] && return 0
error "mount_common" "Could not mount $1" error "mount_common" "Could not mount $1"
@ -442,7 +442,7 @@ do_reboot() {
/usr/bin/busybox umount /storage /usr/bin/busybox umount /storage
fi fi
sleep 2 usleep 2000000
/usr/bin/busybox reboot /usr/bin/busybox reboot
} }
@ -496,7 +496,7 @@ check_disks() {
if [ $i -eq 0 ]; then if [ $i -eq 0 ]; then
progress "Device not found, continuing..." progress "Device not found, continuing..."
else else
sleep 1 usleep 500000
fi fi
elif [ $(( $FSCK_RET & 4 )) -eq 4 ]; then elif [ $(( $FSCK_RET & 4 )) -eq 4 ]; then
# errors left # errors left