Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

This commit is contained in:
Stephan Raue 2013-09-01 20:15:50 +02:00
commit 666529412e
2 changed files with 17 additions and 13 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="connman" PKG_NAME="connman"
PKG_VERSION="1.17" PKG_VERSION="1.18"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -50,18 +50,22 @@ if [ -z "$1" ]; then
fi fi
DISK="$1" DISK="$1"
if [ "$DISK" = "/dev/mmcblk0" ]; then case $DISK in
"/dev/mmcblk1"*)
PART1="${DISK}p1" PART1="${DISK}p1"
PART2="${DISK}p2" PART2="${DISK}p2"
elif [ "$DISK" = "/dev/loop0" ]; then ;;
"/dev/loop"*)
PART1="${DISK}p1" PART1="${DISK}p1"
PART2="${DISK}p2" PART2="${DISK}p2"
IMGFILE="$2" IMGFILE="$2"
losetup $DISK $IMGFILE losetup $DISK $IMGFILE
else ;;
*)
PART1="${DISK}1" PART1="${DISK}1"
PART2="${DISK}2" PART2="${DISK}2"
fi ;;
esac
clear clear
echo "#########################################################" echo "#########################################################"