- blkid modularized

svn-id: @10275

diff --git a/Makefile b/Makefile
index 13c31e84d35b7f8e83beb432096c20a5a44404a4..4ae46187d18067f3a389c72036aaf285f15db5b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # when making release, make sure you do it as RELEASE document describes
 VERSION                := 10000.3
-MODS           := mod-ide.sh mod-luks.sh mod-multipath.sh mod-dmraid.sh mod-lvm.sh mod-md.sh
+MODS           := mod-ide.sh mod-luks.sh mod-multipath.sh mod-dmraid.sh mod-lvm.sh mod-md.sh mod-blkid.sh
 FILES          := Makefile geninitrd.sysconfig geninitrd functions $(MODS) geninitrd.8 geninitrd.8.xml ChangeLog
 prefix         := /usr
 mandir         := $(prefix)/share/man

diff --git a/geninitrd b/geninitrd
index 23d7a08e8c6b432976c0d4cdcb3d208ae83c81fc..48bb3bb30eceab32224074f99e72a5ff94b2817d 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -960,24 +960,6 @@ initrd_gen_nfs() {
        chmod 755 "$DESTDIR/bin/setdhcp"
 }
 
-initrd_gen_blkid()
-{
-       debug "Adding BLKID support to initrd"
-
-       local blkid
-       blkid=$(find_tool $initrd_dir/blkid /sbin/initrd-blkid) || die "Couldn't find blkid suitable for initrd"
-
-       inst_exec $blkid /bin/blkid
-       initrd_gen_devices
-       add_linuxrc <<-'EOF'
-               # if built with blkid change ROOT=LABEL=something into ROOT=/dev/somethingelse -
-               # parsed by blkid
-               if [ "${ROOT##LABEL=}" != "${ROOT}" -o "${ROOT##UUID=}" != "${ROOT}" ]; then
-                       ROOT="$(/bin/blkid -t $ROOT -o device -l)"
-               fi
-       EOF
-}
-
 initrd_gen_setrootdev() {
        debug "Adding rootfs finding based on kernel cmdline root= option support."
        add_linuxrc <<-'EOF'
@@ -1092,10 +1074,8 @@ fi
 . /lib/geninitrd/mod-lvm.sh
 # md addon
 . /lib/geninitrd/mod-md.sh
-
-if [ -x /sbin/initrd-blkid ]; then
-       USE_BLKID=yes
-fi
+# blkid addon
+. /lib/geninitrd/mod-blkid.sh
 
 if [ -r /etc/sysconfig/geninitrd ]; then
        . /etc/sysconfig/geninitrd

diff --git a/mod-blkid.sh b/mod-blkid.sh
new file mode 100644 (file)
index 0000000..9a3de39
--- /dev/null
+++ b/mod-blkid.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# geninitrd mod: blkid
+
+# true if we should parse UUID= or LABEL= for root parameter
+have_blkid=no
+
+blkid=$(find_tool $initrd_dir/blkid /sbin/initrd-blkid)
+if [ -x $blkid ]; then
+       USE_BLKID=yes
+else
+       USE_BLKID=no
+fi
+
+# generate initrd fragment
+# @access      public
+initrd_gen_blkid() {
+       debug "Adding BLKID support to initrd"
+
+       inst_exec $blkid /bin/blkid
+       initrd_gen_devices
+       add_linuxrc <<-'EOF'
+               # if built with blkid change ROOT=LABEL=something into ROOT=/dev/somethingelse -
+               # parsed by blkid
+               if [ "${ROOT##LABEL=}" != "${ROOT}" -o "${ROOT##UUID=}" != "${ROOT}" ]; then
+                       ROOT="$(/bin/blkid -t $ROOT -o device -l)"
+               fi
+       EOF
+}