Author: glen
Date: Thu Apr 2 23:26:50 2009
New Revision: 10275
Added:
geninitrd/trunk/mod-blkid.sh
Modified:
geninitrd/trunk/Makefile
geninitrd/trunk/geninitrd
Log:
- blkid modularized
Modified: geninitrd/trunk/Makefile
==============================================================================
--- geninitrd/trunk/Makefile (original)
+++ geninitrd/trunk/Makefile Thu Apr 2 23:26:50 2009
@@ -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
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Thu Apr 2 23:26:50 2009
@@ -960,24 +960,6 @@
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 @@
. /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
Added: geninitrd/trunk/mod-blkid.sh
==============================================================================
--- (empty file)
+++ geninitrd/trunk/mod-blkid.sh Thu Apr 2 23:26:50 2009
@@ -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
+}
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
