Patchwork [1/1] ddimage: Support Mac OS

login
register
mail settings
Submitter Darren Hart
Date May 23, 2014, 4:28 a.m.
Message ID <113fcfb0c3c5533605e87538cd873c4ff90abcfc.1400815619.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/72619/
State New
Headers show

Comments

Darren Hart - May 23, 2014, 4:28 a.m.
Update the ddimage script to allow it to work on Mac OS too. The biggest
difference is sysfs vs diskutil and in the syntax of the stat command
between Mac OS and Linux, unfortunately. Workarounds using ls, cut, and
columns got really fragile really quickly. Relying on stat and switching
on uname seemed the more robust solution.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 scripts/contrib/ddimage | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)
Koen Kooi - May 24, 2014, 2:44 p.m.
Op 23 mei 2014, om 06:28 heeft Darren Hart <dvhart@linux.intel.com> het volgende geschreven:

> Update the ddimage script to allow it to work on Mac OS too. The biggest
> difference is sysfs vs diskutil and in the syntax of the stat command
> between Mac OS and Linux, unfortunately. Workarounds using ls, cut, and
> columns got really fragile really quickly. Relying on stat and switching
> on uname seemed the more robust solution.
> 
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> ---
> scripts/contrib/ddimage | 25 ++++++++++++++++++++-----
> 1 file changed, 20 insertions(+), 5 deletions(-)
> 
> diff --git a/scripts/contrib/ddimage b/scripts/contrib/ddimage
> index 93ebeaf..b66d0dd 100755
> --- a/scripts/contrib/ddimage
> +++ b/scripts/contrib/ddimage
> @@ -1,7 +1,8 @@
> #!/bin/sh
> 
> -#BLACKLIST_DEVICES="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde"
> -BLACKLIST_DEVICES="/dev/sda"
> +# Default to avoiding the first two disks on typical Linux and Mac OS installs
> +# Better safe than sorry :-)
> +BLACKLIST_DEVICES="/dev/sda /dev/sdb /dev/disk1 /dev/disk3"

s/disk3/disk2/
Darren Hart - May 27, 2014, 3:15 p.m.
On 5/24/14, 7:44, "Koen Kooi" <koen@dominion.thruhere.net> wrote:

>
>Op 23 mei 2014, om 06:28 heeft Darren Hart <dvhart@linux.intel.com> het
>volgende geschreven:
>
>> Update the ddimage script to allow it to work on Mac OS too. The biggest
>> difference is sysfs vs diskutil and in the syntax of the stat command
>> between Mac OS and Linux, unfortunately. Workarounds using ls, cut, and
>> columns got really fragile really quickly. Relying on stat and switching
>> on uname seemed the more robust solution.
>> 
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> ---
>> scripts/contrib/ddimage | 25 ++++++++++++++++++++-----
>> 1 file changed, 20 insertions(+), 5 deletions(-)
>> 
>> diff --git a/scripts/contrib/ddimage b/scripts/contrib/ddimage
>> index 93ebeaf..b66d0dd 100755
>> --- a/scripts/contrib/ddimage
>> +++ b/scripts/contrib/ddimage
>> @@ -1,7 +1,8 @@
>> #!/bin/sh
>> 
>> -#BLACKLIST_DEVICES="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde"
>> -BLACKLIST_DEVICES="/dev/sda"
>> +# Default to avoiding the first two disks on typical Linux and Mac OS
>>installs
>> +# Better safe than sorry :-)
>> +BLACKLIST_DEVICES="/dev/sda /dev/sdb /dev/disk1 /dev/disk3"
>
>s/disk3/disk2/

Bah, indeed. Local change snuck through in my patch. Thanks. Will correct.

Patch

diff --git a/scripts/contrib/ddimage b/scripts/contrib/ddimage
index 93ebeaf..b66d0dd 100755
--- a/scripts/contrib/ddimage
+++ b/scripts/contrib/ddimage
@@ -1,7 +1,8 @@ 
 #!/bin/sh
 
-#BLACKLIST_DEVICES="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde"
-BLACKLIST_DEVICES="/dev/sda"
+# Default to avoiding the first two disks on typical Linux and Mac OS installs
+# Better safe than sorry :-)
+BLACKLIST_DEVICES="/dev/sda /dev/sdb /dev/disk1 /dev/disk3"
 
 # 1MB blocksize
 BLOCKSIZE=1048576
@@ -14,9 +15,15 @@  image_details() {
 	IMG=$1
 	echo "Image details"
 	echo "============="
-	echo "    image: $(stat --printf '%N\n' $IMG)"
-	echo "     size: $(stat -L --printf '%s bytes\n' $IMG)"
-	echo " modified: $(stat -L --printf '%y\n' $IMG)"
+	echo "    image: $(basename $IMG)"
+	# stat format is different on Mac OS and Linux
+	if [ "$(uname)" = "Darwin" ]; then
+		echo "     size: $(stat -L -f '%z bytes' $IMG)"
+		echo " modified: $(stat -L -f '%Sm' $IMG)"
+	else
+		echo "     size: $(stat -L -c '%s bytes' $IMG)"
+		echo " modified: $(stat -L -c '%y' $IMG)"
+	fi
 	echo "     type: $(file -L -b $IMG)"
 	echo ""
 }
@@ -27,6 +34,14 @@  device_details() {
 
 	echo "Device details"
 	echo "=============="
+
+	# Collect disk info using diskutil on Mac OS
+	if [ "$(uname)" = "Darwin" ]; then
+		diskutil info $DEVICE | egrep "(Device Node|Media Name|Total Size)"
+		return
+	fi
+
+	# Default / Linux information collection
 	echo "  device: $DEVICE"
 	if [ -f "/sys/class/block/$DEV/device/vendor" ]; then
 		echo "  vendor: $(cat /sys/class/block/$DEV/device/vendor)"