Attachment 450695 Details for Bug 630434

[patch] Patch fixing reported bug, enabling defintions of override variables in "/etc/sysconfig/initrd" as well as adding a "/etc/sysconfig/initrd" template file.

mkinitrd-2.4.1-0.14.1-initrd.patch (text/plain), 5.14 KB, created by Dennis Olsson on 2011-09-14 12:49:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dennis Olsson

Created: 2011-09-14 12:49:40 UTC

Size: 5.14 KB

patch

obsolete

>diff -Naur mkinitrd-2.4.1-0.14.1/etc/sysconfig/initrd mkinitrd-2.4.1-0.14.1-fixed/etc/sysconfig/initrd
>--- mkinitrd-2.4.1-0.14.1/etc/sysconfig/initrd	1970-01-01 00:00:00.000000000 +0000
>+++ mkinitrd-2.4.1-0.14.1-fixed/etc/sysconfig/initrd	2011-09-14 10:35:52.375843495 +0000
>@@ -0,0 +1,117 @@
>+## Path:	System/Kernel
>+## Description:	Define root device to use during creation of "initrd"
>+## Type:	string
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable contains the name of the root device.  Defaults to the
>+# device from which the root_dir is mounted; Overwrites the "rootdev"
>+# environment variable, if set.
>+# Usually only set, if using some "exotic" like "/dev/disk/by-*/<root dev>",
>+# which cannot be correctly determined by "mkinitrd"!
>+#
>+# NEVER define this variable (not even as empty!), if it is not used!!
>+#
>+#rootdev="/dev/disk/by-label/root"
>+ 
>+## Path:	System/Kernel
>+## Description:	External journal device to use for the root filesystem
>+## Type:	string
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable contains the name of the external journal device for the
>+# root file system.
>+#
>+# NEVER define this variable (not even as empty!), if it is not used!!
>+#
>+#journaldev="/dev/disk/by-label/root-journal"
>+ 
>+## Path:	System/Kernel
>+## Description:	Define root device to use in case "rootdev" is not available
>+## Type:	string
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable contains the name of the root device to fall back to, in cases
>+# where it is not possible to find the "rootdev" during boot.  Defaults to the
>+# device set by "rootdev".
>+#
>+# NEVER define this variable (not even as empty!), if it is not used!!
>+#
>+#fallback_rootdev="/dev/root"
>+ 
>+## Path:	System/Kernel
>+## Description:	Define which resume device to use
>+## Type:	string
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable contains the name of the device used for suspend/resume of the
>+# system.
>+#
>+# NEVER define this variable (not even as empty!), if it is not used!!
>+#
>+#resumedev="/dev/xvda2"
>+#resumedev="/dev/disk/by-label/resume"
>+ 
>+## Path:	System/Kernel
>+## Description:	Define which device to use of dumping of crashed kernels
>+## Type:	string
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable contains the name of the device used for saving of crashed
>+# kernel images.
>+#
>+# NEVER define this variable (not even as empty!), if it is not used!!
>+#
>+#dumpdev="/dev/disk/by-label/dumps"
>+ 
>+## Path:	System/Kernel
>+## Description:	Define which additional features "mkinitrd" should include
>+## Type:	string(iscsi, md, multipath, lvm2, ifup)
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable contains the additional features that are needed in the
>+# created "initrd" image.
>+#
>+# NEVER define this variable (not even as empty!), if it is not used!!
>+#
>+#ADDITIONAL_FEATURES="lvm2 iscsi"
>+
>+## Path:	System/Kernel
>+## Description:	Define whether "mkinitrd" should include iSCSI at boot up
>+## Type:	string(<not defined> or 1)
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable defines whether the "initrd" image should contain the
>+# iSCSI boot startup scripts.
>+# This variable OVERWRITES the automagic settings done by "mkinitrd"
>+# in its discovery of whether the root device is on an iSCSI device.
>+#
>+# This variable overwriting can be used in cases, where iSCSI devices that
>+# have been configured for start up on "onboot", but where the root device
>+# is not on an iSCSI device.
>+#
>+# NEVER define this variable (not even as empty!), if it is not used!!
>+#
>+#root_iscsi=1
>+ 
>+## Path:	System/Kernel
>+## Description:	Define which iSCSI target port to make use of
>+## Type:	integer
>+## Default:	<variable NOT defined at all in this config file!>
>+## Command:     /sbin/mkinitrd
>+#
>+# This variable defines which iSCSI target port to make use of, when attaching
>+# to an iSCSI server.
>+# The setting of this variable has only effect, when "root_iscsi" has been defined,
>+# either above or automagically by the "mkinitrd" setup scripts, in which case it
>+# will overwrite the default port number.
>+# This variable OVERWRITES the automagic settings done by "mkinitrd", when setting
>+# up the iSCSI stack.
>+#
>+#TargetPort=3260
>diff -Naur mkinitrd-2.4.1-0.14.1/sbin/mkinitrd mkinitrd-2.4.1-0.14.1-fixed/sbin/mkinitrd
>--- mkinitrd-2.4.1-0.14.1/sbin/mkinitrd	2010-09-02 10:20:41.000000000 +0000
>+++ mkinitrd-2.4.1-0.14.1-fixed/sbin/mkinitrd	2011-09-13 16:54:38.000000000 +0000
>@@ -434,7 +434,7 @@
> save_var() {
>         # sysconfig options override dynamically generated options
>         if [ -e "/etc/sysconfig/initrd" ]; then
>-                local override="$(cat /etc/sysconfig/initrd | egrep \"^$1=\")"
>+                local override="$(cat /etc/sysconfig/initrd | egrep "^$1=")"
>                 if [ "$override" ]; then
>                         eval $override
>                 fi

Actions: View | Diff

Attachments on bug 630434: 386537 | 386539 | 450674 | 450695 | 450697 | 450703 | 485398 | 485399 | 485400