Browse Source

Prep script can handle mmcblk type devices #56

Bob Mottram 10 years ago
parent
commit
d301ebf72b
1 changed files with 18 additions and 8 deletions
  1. 18
    8
      src/freedombone-prep

+ 18
- 8
src/freedombone-prep View File

58
 
58
 
59
 ROOTFS='bbb'
59
 ROOTFS='bbb'
60
 
60
 
61
+PARTITION_NUMBER=1
62
+
61
 function show_help {
63
 function show_help {
62
     echo ''
64
     echo ''
63
     echo 'freedombone-prep -d [microSD device] --ip [BBB LAN IP address] --iprouter [Router LAN IP address] --mount [mount directory]'
65
     echo 'freedombone-prep -d [microSD device] --ip [BBB LAN IP address] --iprouter [Router LAN IP address] --mount [mount directory]'
143
     echo ''
145
     echo ''
144
     echo '  ls /dev/sd*'
146
     echo '  ls /dev/sd*'
145
     echo ''
147
     echo ''
148
+    echo 'or'
149
+    echo ''
150
+    echo '  ls /dev/mmcblk*'
151
+    echo ''
146
     echo 'Then plugging the microSD back in and entering the same command again'
152
     echo 'Then plugging the microSD back in and entering the same command again'
147
     exit 1
153
     exit 1
148
 fi
154
 fi
149
 
155
 
150
-if [ ! -b ${MICROSD_DRIVE}1 ]; then
151
-    echo "The microSD drive could not be found at ${MICROSD_DRIVE}1"
152
-    exit 2
156
+if [ ! -b ${MICROSD_DRIVE}${PARTITION_NUMBER} ]; then
157
+    if [ -b ${MICROSD_DRIVE}p${PARTITION_NUMBER} ]; then
158
+        PARTITION_NUMBER=p${PARTITION_NUMBER}
159
+    else
160
+        echo "The microSD drive could not be found at ${MICROSD_DRIVE}1"
161
+        exit 2
162
+    fi
153
 fi
163
 fi
154
 
164
 
155
 SUDO=
165
 SUDO=
186
     $SUDO rm $MICROSD_MOUNT_POINT/$ROOTFS
196
     $SUDO rm $MICROSD_MOUNT_POINT/$ROOTFS
187
 fi
197
 fi
188
 $SUDO mkdir -p $MICROSD_MOUNT_POINT/$ROOTFS
198
 $SUDO mkdir -p $MICROSD_MOUNT_POINT/$ROOTFS
189
-$SUDO mount ${MICROSD_DRIVE}1 $MICROSD_MOUNT_POINT/$ROOTFS
199
+$SUDO mount ${MICROSD_DRIVE}${PARTITION_NUMBER} $MICROSD_MOUNT_POINT/$ROOTFS
190
 sync
200
 sync
191
 
201
 
192
-if [ ! -b ${MICROSD_DRIVE}1 ]; then
202
+if [ ! -b ${MICROSD_DRIVE}${PARTITION_NUMBER} ]; then
193
     echo ''
203
     echo ''
194
-    echo "The microSD drive could not be found at ${MICROSD_DRIVE}1"
204
+    echo "The microSD drive could not be found at ${MICROSD_DRIVE}${PARTITION_NUMBER}"
195
     read -p "Wait for the drive to mount then press any key... " -n1 -s
205
     read -p "Wait for the drive to mount then press any key... " -n1 -s
196
-    if [ ! -b ${MICROSD_DRIVE}1 ]; then
197
-        echo "microSD drive not found at ${MICROSD_DRIVE}1"
206
+    if [ ! -b ${MICROSD_DRIVE}${PARTITION_NUMBER} ]; then
207
+        echo "microSD drive not found at ${MICROSD_DRIVE}${PARTITION_NUMBER}"
198
         exit 5
208
         exit 5
199
     fi
209
     fi
200
 fi
210
 fi