diff options
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 49 | ||||
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 54 |
2 files changed, 51 insertions, 52 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 ..." for device in `ls /sys/block/`; do case $device in - loop*) + loop*) # skip loop device - ;; - sr*) + ;; + sr*) # skip CDROM device - ;; - ram*) + ;; + ram*) # skip ram device - ;; - *) - # skip the device LiveOS is on - # Add valid hard drive name to the list - if [ $device != $live_dev_name -a -e /dev/$device ]; then - hdnamelist="$hdnamelist $device" - fi - ;; + ;; + *) + # skip the device LiveOS is on + # Add valid hard drive name to the list + if [ $device != $live_dev_name -a -e /dev/$device ]; then + hdnamelist="$hdnamelist $device" + fi + ;; esac done @@ -49,8 +49,8 @@ for hdname in $hdnamelist; do echo "-------------------------------" echo /dev/$hdname if [ -r /sys/block/$hdname/device/vendor ]; then - echo -n "VENDOR=" - cat /sys/block/$hdname/device/vendor + echo -n "VENDOR=" + cat /sys/block/$hdname/device/vendor fi if [ -r /sys/block/$hdname/device/model ]; then echo -n "MODEL=" @@ -63,18 +63,17 @@ for hdname in $hdnamelist; do echo # Get user choice while true; do - echo -n "Do you want to install this image there? [y/n] " - read answer - if [ "$answer" = "y" -o "$answer" = "n" ]; then - break - fi - echo "Please answer y or n" + echo -n "Do you want to install this image there? [y/n] " + read answer + if [ "$answer" = "y" -o "$answer" = "n" ]; then + break + fi + echo "Please answer y or n" done if [ "$answer" = "y" ]; then - TARGET_DEVICE_NAME=$hdname - break + TARGET_DEVICE_NAME=$hdname + break fi - done if [ -n "$TARGET_DEVICE_NAME" ]; then @@ -170,7 +169,7 @@ if [ -d /tgt_root/etc/ ] ; then echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then - echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist + echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist fi fi diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index c57a0f3700..e1e7cb1bd3 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -23,22 +23,22 @@ echo "Searching for hard drives ..." for device in `ls /sys/block/`; do case $device in - loop*) + loop*) # skip loop device - ;; - sr*) + ;; + sr*) # skip CDROM device - ;; - ram*) + ;; + ram*) # skip ram device - ;; - *) - # skip the device LiveOS is on - # Add valid hard drive name to the list - if [ $device != $live_dev_name -a -e /dev/$device ]; then - hdnamelist="$hdnamelist $device" - fi - ;; + ;; + *) + # skip the device LiveOS is on + # Add valid hard drive name to the list + if [ $device != $live_dev_name -a -e /dev/$device ]; then + hdnamelist="$hdnamelist $device" + fi + ;; esac done @@ -48,8 +48,8 @@ for hdname in $hdnamelist; do echo "-------------------------------" echo /dev/$hdname if [ -r /sys/block/$hdname/device/vendor ]; then - echo -n "VENDOR=" - cat /sys/block/$hdname/device/vendor + echo -n "VENDOR=" + cat /sys/block/$hdname/device/vendor fi if [ -r /sys/block/$hdname/device/model ]; then echo -n "MODEL=" @@ -62,16 +62,16 @@ for hdname in $hdnamelist; do echo # Get user choice while true; do - echo -n "Do you want to install this image there? [y/n] " - read answer - if [ "$answer" = "y" -o "$answer" = "n" ]; then - break - fi - echo "Please answer y or n" + echo -n "Do you want to install this image there? [y/n] " + read answer + if [ "$answer" = "y" -o "$answer" = "n" ]; then + break + fi + echo "Please answer y or n" done if [ "$answer" = "y" ]; then - TARGET_DEVICE_NAME=$hdname - break + TARGET_DEVICE_NAME=$hdname + break fi done @@ -101,7 +101,7 @@ fi mkdir -p /tmp if [ ! -L /etc/mtab ]; then - cat /proc/mounts > /etc/mtab + cat /proc/mounts > /etc/mtab fi disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") @@ -130,8 +130,8 @@ swap_start=$((rootfs_end)) rootwait="" part_prefix="" if [ ! "${device#mmcblk}" = "${device}" ]; then - part_prefix="p" - rootwait="rootwait" + part_prefix="p" + rootwait="rootwait" fi if [ $grub_version -eq 0 ] ; then @@ -211,7 +211,7 @@ if [ -d /tgt_root/etc/ ] ; then echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then - echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist + echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist fi fi umount /tgt_root |