diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-03-27 07:50:46 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-03-27 07:50:46 +0100 |
| commit | 6675f23752836c311fe346804a51c53aba8fedc4 (patch) | |
| tree | dd49d545453cbbb7f6b40df56b6cdd2ed6b7003b | |
| parent | 0f4f04315d51ca7496c1383faffa810420e7a344 (diff) | |
| download | vyatta-cfg-system-6675f23752836c311fe346804a51c53aba8fedc4.tar.gz vyatta-cfg-system-6675f23752836c311fe346804a51c53aba8fedc4.zip | |
T1296: support installation on SD cards
| -rwxr-xr-x | scripts/install/install-functions | 4 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index c9f3642e..56856c8c 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -151,7 +151,7 @@ get_drive_size () { # Probe hardrives not shown in /proc/partitions by default probe_drives () { # Find drives that may not be in /proc/partitions since not mounted - drive=$(ls /sys/block | grep '[hsv]d.|nvme.') + drive=$(ls /sys/block | grep '[hsv]d.|nvme.|mmcblk.') # now exclude all drives that are read-only for drive in $drive; do @@ -176,7 +176,7 @@ select_drive () { # the first grep pattern looks for devices named c0d0, hda, and sda. drives=$(cat /proc/partitions | \ awk '{ if ($4!="name") { print $4 } }' | \ - egrep "c[0-9]d[0-9]$|[hsv]d[a-z]$|nvme[0-9]n[0-9]" | \ + egrep "c[0-9]d[0-9]$|[hsv]d[a-z]$|nvme[0-9]n[0-9]|mmcblk[0-9]p[0-9]" | \ egrep -v "^$") #this needs more testing to decide if better than above diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index b517c460..b3f2741e 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -693,7 +693,7 @@ create_partitions() { exit 1 fi # set the partition number on the device. - if [ -n "$( echo $ldrive | grep -E "cciss|ida|nvme" )" ]; then + if [ -n "$( echo $ldrive | grep -E "cciss|ida|nvme|mmcblk" )" ]; then # if this is a cciss ROOT_PARTITION=$ldrive"p3" efipart=$ldrive"p2" @@ -735,7 +735,7 @@ create_partitions() { fi # set the partition number on the device. - if [ -n "$( echo $ldrive | grep -E "cciss|ida|nvme" )" ]; then + if [ -n "$( echo $ldrive | grep -E "cciss|ida|nvme|mmcblk" )" ]; then # if this is a cciss ROOT_PARTITION=$ldrive"p1" else |