OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=32

mkinitrd-boot.sh

@@ -1,78 +1,23 @@
 #!/bin/bash
-#%stage: volumemanager
-#%depends: evms
-#%programs: /sbin/vgscan /sbin/vgchange /sbin/lvm
-#%modules: linear
-#%if: -n "$root_lvm2"
+#%stage: boot
+#%depends: start
+#%modules: $dm_modules dm-mod dm-snapshot
+#%programs: /sbin/dmsetup /sbin/blockdev
+# dm-crypt dm-zero dm-mirror
+#%if: -n "$root_dm"
 #
-##### LVM (Logical Volume Management)
+##### Device Mapper
 ##
-## This activates and waits for an LVM.
+## If the root device uses device mapper, this initializes and waits for the control file
 ##
 ## Command line parameters
 ## -----------------------
 ##
-## root_lvm2=1		use LVM
-## root=/dev/mapper/... use this device as Volume Group
-## vg_roots		use this group as Volume Group
+## root_dm=1	use device mapper
 ## 
 
-lvm2_get_vg() {
-    local param=$1
-    local vg_root vg_name
-    local sysdev
-    
-    case $param in
-	/dev/disk/by-*/*)
-	    vg_root=
-	    ;;
-	/dev/mapper/*)
-	    vg_name=${o##root=/dev/mapper/}
-	    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
-		for d in /sys/block/$2\!* ; do
-		    if [ -d $d ] ; then
-			sysdev=$d
-		    fi
-		done
-		# Not found in sysfs, looks like a VG then
-		if [ -z "$sysdev" ] ; then
-		    vg_root=$2
-		fi
-	    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)
-    # Fallback if 'root=' is not specified
-    [ -z "$o" ] && o=$rootdev
-    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
+# because we run before udev we need to create the device node manually
+mkdir /dev/mapper
+mknod /dev/mapper/control c 10 63