Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 51 insertions, 15 deletions

diff --git a/scripts/install-rpi.sh b/scripts/install-rpi.sh
index ed85cc53e..0cf88cf4c 100755
--- a/scripts/install-rpi.sh
+++ b/scripts/install-rpi.sh
@@ -7,13 +7,28 @@ if [ $(id -u) -ne 0 ];then
 	exit 1
 fi
 
+f=0
 for tool in parted sfdisk mkfs.vfat mkfs.ext4;do
 	if ! which $tool >/dev/null; then
 		echo "Checking if $tool is installed... failed"
 		f=1
 	fi
 done
-[[ $f -eq 1 ]] && exit 1
+if [ $f -eq 1 ];then exit 1;fi
+
+datadir=0
+keep=0
+while getopts "dk" ch; do
+	case $ch in
+		d)
+			datadir=1
+			;;
+		k)
+			keep=1
+			;;
+	esac
+done
+shift $((OPTIND - 1))
 
 if [ -z $1 ];then
 	echo "Please give your SD card device as first parameter"
@@ -34,7 +49,7 @@ else
 		echo "WARNING: This will destroy all data on $1 - type Yes to continue!"
 		read y
 		if [ "$y" = "Yes" ];then
-			$sfdisk -l $1 2>&1 |grep 'No medium'
+			env LC_ALL=C sfdisk -l $1 2>&1 |grep 'No medium'
 			if [ $? -eq 0 ];then
 				echo "No medium found"
 				exit 1
@@ -66,28 +81,48 @@ rootpart=${1}2
 parted -s $1 mklabel msdos
 sleep 2
 maxsize=$(env LC_ALL=C parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-34))
-datasize=$(($maxsize-2))
+
+if [ $datadir -eq 0 ];then
+	rootsize=$(($maxsize-2))
+else
+	rootsize=$(($maxsize-34))
+	datasize=$(($maxsize-2))
+fi
 
 parted -s $1 unit cyl mkpart primary fat32 -- 0 16
-parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize
-parted -s $1 unit cyl mkpart primary ext2 $rootsize $datasize
-parted -s $1 unit cyl mkpart primary fat32 $datasize $maxsize
-parted -s $1 set 1 boot on
-sfdisk --change-id $1 4 88
+if [ $datadir -eq 0 ];then
+	parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize
+	parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize
+	sfdisk --change-id $1 3 88
+else
+	parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize
+	parted -s $1 unit cyl mkpart primary ext2 $rootsize $datasize
+	parted -s $1 unit cyl mkpart primary fat32 $datasize $maxsize
+	parted -s $1 set 1 boot on
+	sfdisk --change-id $1 4 88
+fi
 sleep 2
 mkfs.vfat ${1}1 >/dev/null
 mkfs.ext4 -q -O ^huge_file ${1}2
-mkfs.ext4 -q -O ^huge_file ${1}3
+if [ $datadir -eq 1 ];then
+	if [ $keep -eq 0 ];then
+		mkfs.ext4 -q -O ^huge_file ${1}3
+	fi
+fi
 sync
 sleep 2
 
 tmp=$(mktemp -d)
 mount -t ext4 ${rootpart} $tmp
 mkdir $tmp/boot
-mkdir $tmp/data
-mount -t ext4 ${1}3 $tmp/data
-mkdir $tmp/data/mpd $tmp/data/xbmc
+if [ $datadir -eq 1 ];then
+	if [ $keep -eq 0 ];then
+		mkdir $tmp/data
+		mount -t ext4 ${1}3 $tmp/data
+		mkdir $tmp/data/mpd $tmp/data/xbmc
+		umount $tmp/data
+	fi
+fi
 mount -t vfat ${1}1 $tmp/boot
 sleep 1
 echo "Extracting install archive"
@@ -95,8 +130,9 @@ tar -C $tmp -xzpf $2
 echo "Fixing permissions"
 chmod 1777 $tmp/tmp
 chmod 4755 $tmp/bin/busybox
-echo "/dev/mmcblk0p3	/data	ext4	rw	0	0" >>$tmp/etc/fstab
-umount $tmp/data
+if [ $datadir -eq 1 ];then
+	echo "/dev/mmcblk0p3	/data	ext4	rw	0	0" >>$tmp/etc/fstab
+fi
 umount $tmp/boot
 umount $tmp
 echo "Successfully installed."