Attachment #227621 for bug #406554

View | Details | Raw Unified | Return to bug 406554
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/mkinitrd.changes (+12 lines)
1	-------------------------------------------------------------------	1	-------------------------------------------------------------------
		2	Mon Jul 14 10:45:09 CEST 2008 - hare@suse.de
		3
		4	- Update documentation
		5	- Remove call to getcfg-interface (bnc#401660)
		6	- Fixup booting from LVM (bnc#406554)
		7
		8	-------------------------------------------------------------------
		9	Thu Jun 26 10:41:18 CEST 2008 - agraf@novell.com
		10
		11	- Escape minus commandline keys (bnc#389672,bnc#403995)
		12
		13	-------------------------------------------------------------------
2	Thu Jun 26 08:47:25 CEST 2008 - hare@suse.de	14	Thu Jun 26 08:47:25 CEST 2008 - hare@suse.de
3		15
4	- Revert init= changes; incompatible with 'normal' kernel	16	- Revert init= changes; incompatible with 'normal' kernel




# device node will be created by udev
check_for_device() {
    local root
    local type
    local retval=1
    local timeout=$udev_timeout
    local dm_major
    local udev_devn
    local udev_major

    root=$1
    type=$2
    if [ "$type" = "root" ] ; then
	dm_major=$root_major
    elif [ "$type" = "resume" ] ; then
	dm_major=$resume_major
    else
	dm_major=
    fi
    if [ -n "$root" ]; then
	echo -n "Waiting for device $root to appear: "
	while [ $timeout -gt 0 ]; do
	    if [ -e $root ]; then
		udev_devn=$(devnumber $root)
		udev_major=$(devmajor $udev_devn)
		if [ -n "$dm_major" ] ; then
		    if [ "$udev_major" == "$dm_major" ] ; then
			echo " ok"
			retval=0
			break;
		    elif [ -x /sbin/multipath ] ; then
			echo -n "!"
			multipath -v0
			wait_for_events




## vg_roots		use this group as Volume Group
## 

lvm2_get_vg() {
    local param=$1
    local vg_root vg_name
    local sysdev
    
    case $param in
	/dev/disk/by-*/*)
	    vg_root=
	    ;;

	    vg_root=${vg_name%%-*}
	    ;;
	/dev/*)
	    set -- $(IFS=/ ; echo $param)
	    if [ "$#" = "3" ] ; then
		# Check sysfs. If there are subdirectories
		# matching this name it's a block device

	    fi
	    ;;
    esac

    echo $vg_root
}

# load the necessary module before we initialize the raid system
load_modules

if [ -n "$root_lvm2" ] ; then
    o=$(get_param root)
    vg_root=$(lvm2_get_vg $o)
    if [ "$vg_root" ] ; then
        # We are waiting for a device-mapper device
	root_major=$(sed -n 's/\(.*\) device-mapper/\1/p' /proc/devices)
    fi
    o=$(get_param resume)
    vg_resume=$(lvm2_get_vg $o)
    if [ "$vg_resume" ] ; then
	resume_major=$(sed -n 's/\(.*\) device-mapper/\1/p' /proc/devices)
    fi
fi

# initialize remebered and parameterized devices
for vgr in $vg_root $vg_resume $vg_roots; do
	vgchange -a y $vgr
done

unset lvm2_get_vg

Return to bug 406554

Lines 46-69 devnumber() { Link Here

(-)a/scripts/boot-devfunctions.sh (-3 / +13 lines)
46	# device node will be created by udev	46	# device node will be created by udev
47	check_for_device() {	47	check_for_device() {
48	local root	48	local root
		49	local type
49	local retval=1	50	local retval=1
50	local timeout=$udev_timeout	51	local timeout=$udev_timeout
		52	local dm_major
51	local udev_devn	53	local udev_devn
52	local udev_major	54	local udev_major
53		55
54	root=$1	56	root=$1
		57	type=$2
		58	if [ "$type" = "root" ] ; then
		59	dm_major=$root_major
		60	elif [ "$type" = "resume" ] ; then
		61	dm_major=$resume_major
		62	else
		63	dm_major=
		64	fi
55	if [ -n "$root" ]; then	65	if [ -n "$root" ]; then
56	echo -n "Waiting for device $root to appear: "	66	echo -n "Waiting for device $root to appear: "
57	while [ $timeout -gt 0 ]; do	67	while [ $timeout -gt 0 ]; do
58	if [ -e $root ]; then	68	if [ -e $root ]; then
59	udev_devn=$(devnumber $root)	69	udev_devn=$(devnumber $root)
60	udev_major=$(devmajor $udev_devn)	70	udev_major=$(devmajor $udev_devn)
61	if [ -n "$root_major" ] ; then	71	if [ -n "$dm_major" ] ; then
62	if [ "$udev_major" == "$root_major" ] ; then	72	if [ "$udev_major" == "$dm_major" ] ; then
63	echo " ok"	73	echo " ok"
64	retval=0	74	retval=0
65	break;	75	break;
66	else	76	elif [ -x /sbin/multipath ] ; then
67	echo -n "!"	77	echo -n "!"
68	multipath -v0	78	multipath -v0
69	wait_for_events	79	wait_for_events

Lines 17-28 Link Here

(-)a/scripts/boot-lvm2.sh (-9 / +26 lines)
17	## vg_roots use this group as Volume Group	17	## vg_roots use this group as Volume Group
18	##	18	##
19		19
20	# load the necessary module before we initialize the raid system	20	lvm2_get_vg() {
21	load_modules	21	local param=$1
22		22	local vg_root vg_name
23	if [ -n "$root_lvm2" ] ; then	23	local sysdev
24	o=$(get_param root)	24
25	case $o in	25	case $param in
26	/dev/disk/by-/)	26	/dev/disk/by-/)
27	vg_root=	27	vg_root=
28	;;	28	;;
Lines 31-37 if [ -n "$root_lvm2" ] ; then Link Here
31	vg_root=${vg_name%%-*}	31	vg_root=${vg_name%%-*}
32	;;	32	;;
33	/dev/*)	33	/dev/*)
34	set -- $(IFS=/ ; echo $o)	34	set -- $(IFS=/ ; echo $param)
35	if [ "$#" = "3" ] ; then	35	if [ "$#" = "3" ] ; then
36	# Check sysfs. If there are subdirectories	36	# Check sysfs. If there are subdirectories
37	# matching this name it's a block device	37	# matching this name it's a block device
Lines 47-59 if [ -n "$root_lvm2" ] ; then Link Here
47	fi	47	fi
48	;;	48	;;
49	esac	49	esac
50	if [ "$vg_root" ] \|\| [ "$vg_roots" ] ; then	50
		51	echo $vg_root
		52	}
		53
		54	# load the necessary module before we initialize the raid system
		55	load_modules
		56
		57	if [ -n "$root_lvm2" ] ; then
		58	o=$(get_param root)
		59	vg_root=$(lvm2_get_vg $o)
		60	if [ "$vg_root" ] ; then
51	# We are waiting for a device-mapper device	61	# We are waiting for a device-mapper device
52	root_major=$(sed -n 's/\(.*\) device-mapper/\1/p' /proc/devices)	62	root_major=$(sed -n 's/\(.*\) device-mapper/\1/p' /proc/devices)
53	fi	63	fi
		64	o=$(get_param resume)
		65	vg_resume=$(lvm2_get_vg $o)
		66	if [ "$vg_resume" ] ; then
		67	resume_major=$(sed -n 's/\(.*\) device-mapper/\1/p' /proc/devices)
		68	fi
54	fi	69	fi
55		70
56	# initialize remebered and parameterized devices	71	# initialize remebered and parameterized devices
57	for vgr in $vg_root $vg_roots; do	72	for vgr in $vg_root $vg_resume $vg_roots; do
58	vgchange -a y $vgr	73	vgchange -a y $vgr
59	done	74	done
		75
		76	unset lvm2_get_vg