kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass device name instead of major:minor in for_each_host_dev_fs() 

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
master
Cong Wang 2011-12-20 14:09:59 +08:00 committed by Harald Hoyer
parent 426b68b20a
commit d0096de764
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dracut
View File

@ -528,9 +528,8 @@ chmod 755 "$initdir"
for line in "${fstab_lines[@]}"; do for line in "${fstab_lines[@]}"; do
set -- $line set -- $line
#dev mp fs fsopts #dev mp fs fsopts
dev="$(get_maj_min $1)" push host_devs "$1"
push host_devs "${dev:-$1}" push host_fs_types "$1|$3"
push host_fs_types "$dev|$3"
done done


for f in $add_fstab; do for f in $add_fstab; do
@ -556,13 +555,13 @@ if [[ $hostonly ]]; then


for mp in "${host_mp[@]}"; do for mp in "${host_mp[@]}"; do
mountpoint "$mp" >/dev/null 2>&1 || continue mountpoint "$mp" >/dev/null 2>&1 || continue
push host_devs $(find_block_device "$mp") push host_devs $(readlink -f "/dev/block/$(find_block_device "$mp")")
done done
fi fi


_get_fs_type() ( _get_fs_type() (
[[ $1 ]] || return [[ $1 ]] || return
if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then if [[ -b $1 ]] && get_fs_env $1; then
echo "$1|$ID_FS_TYPE" echo "$1|$ID_FS_TYPE"
return 1 return 1
fi fi
@ -576,7 +575,7 @@ _get_fs_type() (
for dev in "${host_devs[@]}"; do for dev in "${host_devs[@]}"; do
unset fs_type unset fs_type
for fstype in $(_get_fs_type $dev) \ for fstype in $(_get_fs_type $dev) \
$(check_block_and_slaves _get_fs_type $dev); do $(check_block_and_slaves _get_fs_type $(get_maj_min $dev)); do
if ! strstr " ${host_fs_types[*]} " " $fstype ";then if ! strstr " ${host_fs_types[*]} " " $fstype ";then
push host_fs_types "$fstype" push host_fs_types "$fstype"
fi fi

11
dracut-functions
View File

@ -247,16 +247,17 @@ find_root_block_device() { find_block_device /; }
for_each_host_dev_fs() for_each_host_dev_fs()
{ {
local _func="$1" local _func="$1"
local _dev
local _fs
for f in ${host_fs_types[@]}; do for f in ${host_fs_types[@]}; do
OLDIFS="$IFS" OLDIFS="$IFS"
IFS="|" IFS="|"
set -- $f set -- $f
IFS="$OLDIFS" IFS="$OLDIFS"
dev=$1 _dev="$1"
[[ -b /dev/block/$dev ]] && dev="/dev/block/$dev" [[ -b "$_dev" ]] || continue
[[ -b $dev ]] || continue _fs="$2"
fs="$2" $_func $_dev $_fs
$_func $dev $fs
done done
} }