From: Harald Hoyer <harald@redhat.com>
Date: Mon, 18 May 2009 12:05:36 +0000 (+0200)
Subject: merge 95rootfs-block-udev and 95rootfs-block
X-Git-Tag: 0.1~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3c06c2da88555371e5832da1304b5b8318be407;p=thirdparty%2Fdracut.git

merge 95rootfs-block-udev and 95rootfs-block
---

diff --git a/modules.d/95rootfs-block-udev/genrules.sh b/modules.d/95rootfs-block-udev/genrules.sh
deleted file mode 100755
index 0b42483bd..000000000
--- a/modules.d/95rootfs-block-udev/genrules.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-
-resume=$(getarg resume=) && ! getarg noresume && [ -b "$resume" ] && {
-    (
-    	/bin/echo -e 'KERNEL=="'${resume#/dev/}'", RUN+="/bin/echo %M:%m > /sys/power/resume"'
-    	/bin/echo -e 'SYMLINK=="'${resume#/dev/}'", RUN+="/bin/echo %M:%m > /sys/power/resume"'
-    ) >> /etc/udev/rules.d/99-resume.rules
-}
-
-(
- echo 'KERNEL=="'${root#/dev/}'", RUN+="/bin/mount '$fstype' -o '$rflags' '$root' '$NEWROOT'" '
- echo 'SYMLINK=="'${root#/dev/}'", RUN+="/bin/mount '$fstype' -o '$rflags' '$root' '$NEWROOT'" '
-) >> /etc/udev/rules.d/99-mount.rules
-
-
diff --git a/modules.d/95rootfs-block-udev/install b/modules.d/95rootfs-block-udev/install
deleted file mode 100755
index 3b02232f6..000000000
--- a/modules.d/95rootfs-block-udev/install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-dracut_install echo
-inst_hook pre-udev 10 "$moddir/parse-root-opts.sh"
-inst_hook pre-udev 20 "$moddir/genrules.sh"
diff --git a/modules.d/95rootfs-block-udev/parse-root-opts.sh b/modules.d/95rootfs-block-udev/parse-root-opts.sh
deleted file mode 100755
index 77aed558a..000000000
--- a/modules.d/95rootfs-block-udev/parse-root-opts.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-if resume=$(getarg resume=) && ! getarg noresume; then 
-    export resume
-    echo "$resume" >/.resume
-else
-    unset resume
-fi
-
-root=$(getarg root=)
-case $root in
-    LABEL=*) root=${root#LABEL=}
-    root="$(echo $root |sed 's,/,\\x2f,g')"
-    root="/dev/disk/by-label/${root}" ;;
-    UUID=*) root="/dev/disk/by-uuid/${root#UUID=}" ;;
-    '') echo "Warning: no root specified"
-        root="/dev/sda1" ;;
-esac
-
-if rflags="$(getarg rootflags=)"; then
-    getarg rw && rflags="${rflags},rw" || rflags="${rflags},ro"
-else
-    getarg rw && rflags=rw || rflags=ro
-fi
-
-fstype="$(getarg rootfstype=)" && fstype="-t ${fstype}" || fstype="-t auto"
-
-export fstype rflags root
diff --git a/modules.d/95rootfs-block/install b/modules.d/95rootfs-block/install
index 8782fb5bc..3b0dc4612 100755
--- a/modules.d/95rootfs-block/install
+++ b/modules.d/95rootfs-block/install
@@ -1,3 +1,5 @@
 #!/bin/sh
+dracut_install echo
 inst_hook pre-udev 10 "$moddir/parse-root-opts.sh"
-inst_hook mount 99 "$moddir/mount-root.sh"
+inst_hook pre-udev 20 "$moddir/genrules.sh"
+#inst_hook mount 99 "$moddir/mount-root.sh"
diff --git a/modules.d/95rootfs-block/parse-root-opts.sh b/modules.d/95rootfs-block/parse-root-opts.sh
index 473c34dc1..77aed558a 100755
--- a/modules.d/95rootfs-block/parse-root-opts.sh
+++ b/modules.d/95rootfs-block/parse-root-opts.sh
@@ -22,6 +22,6 @@ else
     getarg rw && rflags=rw || rflags=ro
 fi
 
-fstype="$(getarg rootfstype=)" && fstype="-t ${fstype}"
+fstype="$(getarg rootfstype=)" && fstype="-t ${fstype}" || fstype="-t auto"
 
 export fstype rflags root