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

replace sys/block with $block

Browse source
This commit is contained in:
Tobias Powalowski 2010-05-19 19:59:16 +02:00
parent 2fe001a4e0
commit e3cfdffe5e
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -715,7 +715,7 @@ _getavaildisks()
if [ "$(echo "$i" | grep '/dev/mapper')" ]; then if [ "$(echo "$i" | grep '/dev/mapper')" ]; then
echo -n "$i : "; echo $(($(expr 512 '*' $(dmsetup status $i | cut -f2 -d " "))/1000000)) MB; echo "\n" echo -n "$i : "; echo $(($(expr 512 '*' $(dmsetup status $i | cut -f2 -d " "))/1000000)) MB; echo "\n"
else else
echo -n "$i : "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i)/size))/1000000)) MB; echo "\n" echo -n "$i : "; echo $(($(expr 512 '*' $(cat $block/$(basename $i)/size))/1000000)) MB; echo "\n"
fi fi
done done
} }
@ -729,10 +729,17 @@ _getavailpartitions()
for i in $(findpartitions); do for i in $(findpartitions); do
# mmc and raid partitions # mmc and raid partitions
if [ "$(echo "$i" | grep '/dev/md_d[0-9]')" -o "$(echo "$i" | grep '/dev/md[0-9]p')" -o "$(echo "$i" | grep '/dev/mmcblk')" ]; then if [ "$(echo "$i" | grep '/dev/md_d[0-9]')" -o "$(echo "$i" | grep '/dev/md[0-9]p')" -o "$(echo "$i" | grep '/dev/mmcblk')" ]; then
echo -n "$i : "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i | sed -e 's#p.*##g')/$(basename $i)/size))/1000000)) MB; echo "\n" echo -n "$i: "; echo $(($(expr 512 '*' $(cat $block/$(basename $i | sed -e 's#p.*##g')/$(basename $i)/size))/1000000)) MB; echo "\n"
# special block devices
elif [ "$(echo "$i" | grep "/dev/rd")" ]; then
echo -n "$i: "; echo $(($(expr 512 '*' $(cat $block/rd\!$(basename $i | sed -e 's#p.*##g')/rd\!$(basename $i)/size))/1000000)) MB; echo "\n"
elif [ "$(echo "$i" | grep "/dev/cciss")" ]; then
echo -n "$i: "; echo $(($(expr 512 '*' $(cat $block/cciss\!$(basename $i | sed -e 's#p.*##g')/cciss\!$(basename $i)/size))/1000000)) MB; echo "\n"
elif [ "$(echo "$i" | grep "/dev/ida")" ]; then
echo -n "$i: "; echo $(($(expr 512 '*' $(cat $block/ida\!$(basename $i | sed -e 's#p.*##g')/ida\!$(basename $i)/size))/1000000)) MB; echo "\n"
# raid device # raid device
elif [ "$(echo "$i" | grep -v 'p' |grep '/dev/md')" ]; then elif [ "$(echo "$i" | grep -v 'p' |grep '/dev/md')" ]; then
echo -n "$i : "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i)/size))/1000000)) MB; echo "\n" echo -n "$i: "; echo $(($(expr 512 '*' $(cat $block/$(basename $i)/size))/1000000)) MB; echo "\n"
# mapper devices # mapper devices
elif [ "$(echo "$i" | grep '/dev/mapper')" ]; then elif [ "$(echo "$i" | grep '/dev/mapper')" ]; then
# crypt device # crypt device
@ -740,13 +747,13 @@ _getavailpartitions()
echo -n "$i: "; echo $(($(expr 512 '*' $(cryptsetup status $(basename $i) | grep " size:" | sed -e 's#sectors##g' -e 's#size:##g'))/1000000)) MB; echo "\n" echo -n "$i: "; echo $(($(expr 512 '*' $(cryptsetup status $(basename $i) | grep " size:" | sed -e 's#sectors##g' -e 's#size:##g'))/1000000)) MB; echo "\n"
# dmraid device # dmraid device
elif [ "$(dmsetup info $i | grep 'DMRAID')" ]; then elif [ "$(dmsetup info $i | grep 'DMRAID')" ]; then
[ $(echo $i | grep 'p*[0-9]$') ] && echo -n "$i : "; echo $(($(expr 512 '*' $(dmsetup status $i | cut -f2 -d " "))/1000000)) MB; echo "\n" [ $(echo $i | grep 'p*[0-9]$') ] && echo -n "$i: "; echo $(($(expr 512 '*' $(dmsetup status $i | cut -f2 -d " "))/1000000)) MB; echo "\n"
# mapper device # mapper device
else else
echo -n "$i : "; echo $(lvs -o lv_size --noheading --units m $i | sed -e 's#m##g') MB; echo "\n" echo -n "$i: "; echo $(lvs -o lv_size --noheading --units m $i | sed -e 's#m##g') MB; echo "\n"
fi fi
else else
echo -n "$i: "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i | sed -e 's#[0-9].*##g')/$(basename $i)/size))/1000000)) MB; echo "\n" echo -n "$i: "; echo $(($(expr 512 '*' $(cat $block/$(basename $i | sed -e 's#[0-9].*##g')/$(basename $i)/size))/1000000)) MB; echo "\n"
fi fi
done done
} }
@ -1124,8 +1131,8 @@ _createpv()
# skip md devices, which already have lvm devices! # skip md devices, which already have lvm devices!
for i in $PARTS; do for i in $PARTS; do
mdcheck="$(echo $i | sed -e 's#/dev/##g')" mdcheck="$(echo $i | sed -e 's#/dev/##g')"
if ! [ "$(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" = "" ]; then if ! [ "$(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" = "" ]; then
for k in $(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do for k in $(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do
# check encrypted volume # check encrypted volume
realdevice="$(cryptsetup status $(cat $k/dm/name) 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')" realdevice="$(cryptsetup status $(cat $k/dm/name) 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')"
[ "$(lvs $realdevice 2>/dev/null)" ] && ALREADYINUSE="$ALREADYINUSE $i" [ "$(lvs $realdevice 2>/dev/null)" ] && ALREADYINUSE="$ALREADYINUSE $i"
@ -1137,8 +1144,8 @@ _createpv()
# skip md partition devices, which already have lvm devices! # skip md partition devices, which already have lvm devices!
for i in $PARTS; do for i in $PARTS; do
mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')" mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')"
if [ "$(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" != "" -a "$mdcheck" != "" ]; then if [ "$(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" != "" -a "$mdcheck" != "" ]; then
for k in $(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do for k in $(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do
# check encrypted volume # check encrypted volume
realdevice="$(cryptsetup status $(cat $k/dm/name) 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')" realdevice="$(cryptsetup status $(cat $k/dm/name) 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')"
[ "$(lvs $realdevice 2>/dev/null)" ] && ALREADYINUSE="$ALREADYINUSE $i" [ "$(lvs $realdevice 2>/dev/null)" ] && ALREADYINUSE="$ALREADYINUSE $i"
@ -1391,8 +1398,8 @@ _luks()
# remove hidden crypt by md device # remove hidden crypt by md device
if [ "$(echo $devpath | grep /dev/md)" ]; then if [ "$(echo $devpath | grep /dev/md)" ]; then
mdcheck="$(echo $devpath | sed -e 's#/dev/##g')" mdcheck="$(echo $devpath | sed -e 's#/dev/##g')"
if ! [ "$(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" = "" ]; then if ! [ "$(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" = "" ]; then
for k in $(find /sys/block/$mdcheck/slaves/ -name 'dm*'); do for k in $(find $block/$mdcheck/slaves/ -name 'dm*'); do
if [ "$(cryptsetup status $(cat $k/dm/name))" ]; then if [ "$(cryptsetup status $(cat $k/dm/name))" ]; then
killvolumegroup="$(echo $(pvs -o vg_name --noheading $devpath))" killvolumegroup="$(echo $(pvs -o vg_name --noheading $devpath))"
ALREADYINUSE="$ALREADYINUSE $(ls /dev/mapper/$killvolumegroup-*)" ALREADYINUSE="$ALREADYINUSE $(ls /dev/mapper/$killvolumegroup-*)"
@ -1404,8 +1411,8 @@ _luks()
# skip md devices, which already has encrypted devices! # skip md devices, which already has encrypted devices!
for i in $PARTS; do for i in $PARTS; do
mdcheck="$(echo $i | sed -e 's#/dev/##g')" mdcheck="$(echo $i | sed -e 's#/dev/##g')"
if ! [ "$(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" = "" ]; then if ! [ "$(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" = "" ]; then
for k in $(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do for k in $(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do
[ "$(cryptsetup status $(cat $k/dm/name))" ] && ALREADYINUSE="$ALREADYINUSE $i" [ "$(cryptsetup status $(cat $k/dm/name))" ] && ALREADYINUSE="$ALREADYINUSE $i"
# check lvm devices if encryption was used! # check lvm devices if encryption was used!
if [ "$(lvs /dev/mapper/$(cat $k/dm/name) 2>/dev/null)" ]; then if [ "$(lvs /dev/mapper/$(cat $k/dm/name) 2>/dev/null)" ]; then
@ -1419,8 +1426,8 @@ _luks()
# skip md partition devices, which already has encrypted devices! # skip md partition devices, which already has encrypted devices!
for i in $PARTS; do for i in $PARTS; do
mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')" mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')"
if [ "$(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" != "" -a "$mdcheck" != "" ]; then if [ "$(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null)" != "" -a "$mdcheck" != "" ]; then
for k in $(find /sys/block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do for k in $(find $block/$mdcheck/slaves/ -name 'dm*' 2>/dev/null); do
[ "$(cryptsetup status $(cat $k/dm/name))" ] && ALREADYINUSE="$ALREADYINUSE $i" [ "$(cryptsetup status $(cat $k/dm/name))" ] && ALREADYINUSE="$ALREADYINUSE $i"
# check lvm devices if encryption was used! # check lvm devices if encryption was used!
if [ "$(lvs /dev/mapper/$(cat $k/dm/name) 2>/dev/null)" ]; then if [ "$(lvs /dev/mapper/$(cat $k/dm/name) 2>/dev/null)" ]; then
@ -1503,7 +1510,7 @@ autoprepare() {
ROOT_PART_SET="" ROOT_PART_SET=""
CHOSEN_FS="" CHOSEN_FS=""
# get just the disk size in 1000*1000 MB # get just the disk size in 1000*1000 MB
DISC_SIZE=$(echo $(($(expr 512 '*' $(cat /sys/block/$(basename $DISC)/size))/1000000))) DISC_SIZE=$(echo $(($(expr 512 '*' $(cat $block/$(basename $DISC)/size))/1000000)))
while [ "$DEFAULTFS" = "" ]; do while [ "$DEFAULTFS" = "" ]; do
FSOPTS="" FSOPTS=""
[ "$(which mkfs.ext2 2>/dev/null)" ] && FSOPTS="$FSOPTS ext2 Ext2" [ "$(which mkfs.ext2 2>/dev/null)" ] && FSOPTS="$FSOPTS ext2 Ext2"