diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-15 18:18:16 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:47:28 +0100 |
commit | 99a7c5b50dd824b4fb7fdfb77e71157ed096d8e2 (patch) | |
tree | 5db048400267b7ec73b782f3634e26111467f596 /meta/recipes-core/initrdscripts/files/init-install-efi.sh | |
parent | a10c4481f164071c83a397d3e66c76537670da35 (diff) | |
download | poky-99a7c5b50dd824b4fb7fdfb77e71157ed096d8e2.tar.gz |
init-install: code cleanup: Replace tabs with spaces
Cleaned up spaces from init-install* shell scripts.
(From OE-Core rev: 2cc5492a7e196adaab8bc35b48299c9e4d229ebc)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi.sh')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index a6a86790c8..dca1432e40 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -24,22 +24,22 @@ echo "Searching for hard drives ..." | |||
24 | 24 | ||
25 | for device in `ls /sys/block/`; do | 25 | for device in `ls /sys/block/`; do |
26 | case $device in | 26 | case $device in |
27 | loop*) | 27 | loop*) |
28 | # skip loop device | 28 | # skip loop device |
29 | ;; | 29 | ;; |
30 | sr*) | 30 | sr*) |
31 | # skip CDROM device | 31 | # skip CDROM device |
32 | ;; | 32 | ;; |
33 | ram*) | 33 | ram*) |
34 | # skip ram device | 34 | # skip ram device |
35 | ;; | 35 | ;; |
36 | *) | 36 | *) |
37 | # skip the device LiveOS is on | 37 | # skip the device LiveOS is on |
38 | # Add valid hard drive name to the list | 38 | # Add valid hard drive name to the list |
39 | if [ $device != $live_dev_name -a -e /dev/$device ]; then | 39 | if [ $device != $live_dev_name -a -e /dev/$device ]; then |
40 | hdnamelist="$hdnamelist $device" | 40 | hdnamelist="$hdnamelist $device" |
41 | fi | 41 | fi |
42 | ;; | 42 | ;; |
43 | esac | 43 | esac |
44 | done | 44 | done |
45 | 45 | ||
@@ -49,8 +49,8 @@ for hdname in $hdnamelist; do | |||
49 | echo "-------------------------------" | 49 | echo "-------------------------------" |
50 | echo /dev/$hdname | 50 | echo /dev/$hdname |
51 | if [ -r /sys/block/$hdname/device/vendor ]; then | 51 | if [ -r /sys/block/$hdname/device/vendor ]; then |
52 | echo -n "VENDOR=" | 52 | echo -n "VENDOR=" |
53 | cat /sys/block/$hdname/device/vendor | 53 | cat /sys/block/$hdname/device/vendor |
54 | fi | 54 | fi |
55 | if [ -r /sys/block/$hdname/device/model ]; then | 55 | if [ -r /sys/block/$hdname/device/model ]; then |
56 | echo -n "MODEL=" | 56 | echo -n "MODEL=" |
@@ -63,18 +63,17 @@ for hdname in $hdnamelist; do | |||
63 | echo | 63 | echo |
64 | # Get user choice | 64 | # Get user choice |
65 | while true; do | 65 | while true; do |
66 | echo -n "Do you want to install this image there? [y/n] " | 66 | echo -n "Do you want to install this image there? [y/n] " |
67 | read answer | 67 | read answer |
68 | if [ "$answer" = "y" -o "$answer" = "n" ]; then | 68 | if [ "$answer" = "y" -o "$answer" = "n" ]; then |
69 | break | 69 | break |
70 | fi | 70 | fi |
71 | echo "Please answer y or n" | 71 | echo "Please answer y or n" |
72 | done | 72 | done |
73 | if [ "$answer" = "y" ]; then | 73 | if [ "$answer" = "y" ]; then |
74 | TARGET_DEVICE_NAME=$hdname | 74 | TARGET_DEVICE_NAME=$hdname |
75 | break | 75 | break |
76 | fi | 76 | fi |
77 | |||
78 | done | 77 | done |
79 | 78 | ||
80 | if [ -n "$TARGET_DEVICE_NAME" ]; then | 79 | if [ -n "$TARGET_DEVICE_NAME" ]; then |
@@ -170,7 +169,7 @@ if [ -d /tgt_root/etc/ ] ; then | |||
170 | echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab | 169 | echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab |
171 | # We dont want udev to mount our root device while we're booting... | 170 | # We dont want udev to mount our root device while we're booting... |
172 | if [ -d /tgt_root/etc/udev/ ] ; then | 171 | if [ -d /tgt_root/etc/udev/ ] ; then |
173 | echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist | 172 | echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist |
174 | fi | 173 | fi |
175 | fi | 174 | fi |
176 | 175 | ||