root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

changed setup to correct blkid output

Browse source
This commit is contained in:
Tobias Powalowski 2010-02-08 16:12:03 +01:00
parent 915950b58e
commit 791c106e48
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
usr/share/archboot/installer/setup
View file

@ -254,14 +254,14 @@ findpartitions() {
#- part of raid device #- part of raid device
# $(cat /proc/mdstat 2>/dev/null | grep $part) # $(cat /proc/mdstat 2>/dev/null | grep $part)
#- part of lvm2 device #- part of lvm2 device
# $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "lvm2") # $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LVM2")
#- part of luks device #- part of luks device
# $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS") # $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS")
#- extended partition #- extended partition
# $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5") # $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")
#- extended partition on raid partition device #- extended partition on raid partition device
# $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g" 2>/dev/null | grep "5") # $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g" 2>/dev/null | grep "5")
if ! [ "$(cat /proc/mdstat 2>/dev/null | grep $part)" -o "$(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "lvm2")" -o $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS") -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g") 2>/dev/null | grep "5")" ]; then if ! [ "$(cat /proc/mdstat 2>/dev/null | grep $part)" -o "$(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LVM2")" -o $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS") -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g") 2>/dev/null | grep "5")" ]; then
if [ -d $block/$disk/$part ]; then if [ -d $block/$disk/$part ]; then
echo "/dev/$part" echo "/dev/$part"
[ "$1" ] && echo $1 [ "$1" ] && echo $1
@ -275,7 +275,7 @@ findpartitions() {
partofcrypt="$partofcrypt $k" partofcrypt="$partofcrypt $k"
done done
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
k="$(blkid -c=/dev/null /dev/mapper/$devpath 2>/dev/null | grep "TYPE=\"lvm2pv\"" | sed -e 's#:.*##g')" k="$(blkid -c=/dev/null /dev/mapper/$devpath 2>/dev/null | grep "TYPE=\"LVM2_member\"" | sed -e 's#:.*##g')"
partoflvm="$partoflvm $k" partoflvm="$partoflvm $k"
done done
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
@ -291,7 +291,7 @@ findpartitions() {
# include none partitionable raid md devices # include none partitionable raid md devices
for devpath in $(ls -d /dev/md* 2>/dev/null | grep md[0-9]); do for devpath in $(ls -d /dev/md* 2>/dev/null | grep md[0-9]); do
# exlude md partitions which are part of lvm # exlude md partitions which are part of lvm
if ! [ "$(blkid -c=/dev/null $devpath | grep "TYPE=\"lvm2pv\"")" -o "$(blkid -c=/dev/null $devpath | grep "TYPE=\"crypt_LUKS\"")" ]; then if ! [ "$(blkid -c=/dev/null $devpath | grep "TYPE=\"LVM2_member\"")" -o "$(blkid -c=/dev/null $devpath | grep "TYPE=\"crypt_LUKS\"")" ]; then
echo "$devpath" echo "$devpath"
[ "$1" ] && echo $1 [ "$1" ] && echo $1
fi fi
@ -374,14 +374,14 @@ findbootloaderpartitions() {
#- part of raid device #- part of raid device
# $(cat /proc/mdstat 2>/dev/null | grep $part) # $(cat /proc/mdstat 2>/dev/null | grep $part)
#- part of lvm2 device #- part of lvm2 device
# $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "lvm2") # $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LVM2")
#- part of luks device #- part of luks device
# $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS") # $(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS")
#- extended partition #- extended partition
# $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5") # $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")
#- extended partition on raid partition device #- extended partition on raid partition device
# $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g" 2>/dev/null | grep "5") # $(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g" 2>/dev/null | grep "5")
if ! [ "$(cat /proc/mdstat 2>/dev/null | grep $part)" -o "$(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "lvm2")" -o "$(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g") 2>/dev/null | grep "5")" ]; then if ! [ "$(cat /proc/mdstat 2>/dev/null | grep $part)" -o "$(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LVM2")" -o "$(blkid -c=/dev/null -o value -s TYPE /dev/$part | grep "LUKS")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk\p##g") 2>/dev/null | grep "5")" ]; then
if [ -d $block/$disk/$part ]; then if [ -d $block/$disk/$part ]; then
echo "/dev/$part" echo "/dev/$part"
[ "$1" ] && echo $1 [ "$1" ] && echo $1
@ -410,7 +410,7 @@ findbootloaderpartitions() {
partofcrypt="$partofcrypt $k" partofcrypt="$partofcrypt $k"
done done
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
k="$(blkid -c=/dev/null /dev/mapper/$devpath 2>/dev/null | grep "TYPE=\"lvm2pv\"" | sed -e 's#:.*##g')" k="$(blkid -c=/dev/null /dev/mapper/$devpath 2>/dev/null | grep "TYPE=\"LVM2_member\"" | sed -e 's#:.*##g')"
partoflvm="$partoflvm $k" partoflvm="$partoflvm $k"
done done
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do