[dracut/f17] dracut-018-40.git20120522
Harald Hoyer
harald at fedoraproject.org
Tue May 22 09:54:37 UTC 2012
commit d2ee3d872de75d4e286728fe13a36aa4f3acbe30
Author: Harald Hoyer <harald at redhat.com>
Date: Tue May 22 11:52:45 2012 +0200
dracut-018-40.git20120522
- fixed s390 dasd handling
- fixed DNS bug for s390
...re-that-we-get-the-storage-modules-into-t.patch | 24 +++++++++++
...he-right-argument-for-dasd-module-options.patch | 42 +++++++++++++++++++
...e-dasd-arg-contents-into-proper-dasd.conf.patch | 43 ++++++++++++++++++++
...alize-dasd-argument-content-for-dasd.conf.patch | 38 +++++++++++++++++
...-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch | 34 +++++++++++++++
dracut.spec | 13 +++++-
6 files changed, 192 insertions(+), 2 deletions(-)
---
diff --git a/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch b/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
new file mode 100644
index 0000000..5199d4a
--- /dev/null
+++ b/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
@@ -0,0 +1,24 @@
+From 41724edf33fe0d7bc94f82b2dce7d37211610af8 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 May 2012 01:33:17 -0500
+Subject: [PATCH] ARM: make sure that we get the storage modules into the
+ initramfs
+
+---
+ modules.d/90kernel-modules/module-setup.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 26f4784..fd8b92c 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -35,6 +35,9 @@ installkernel() {
+ hostonly='' instmods pcmcia firewire-ohci
+ hostonly='' instmods usb_storage sdhci sdhci-pci
+
++ # arm specific modules
++ hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap sdhci_dove ahci_platform pata_imx sata_mv
++
+ # install keyboard support
+ hostonly='' instmods atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech hid-logitech-dj hid-microsoft ehci-hcd ohci-hcd uhci-hcd
+ # install unix socket support
diff --git a/0036-Use-the-right-argument-for-dasd-module-options.patch b/0036-Use-the-right-argument-for-dasd-module-options.patch
new file mode 100644
index 0000000..efaee90
--- /dev/null
+++ b/0036-Use-the-right-argument-for-dasd-module-options.patch
@@ -0,0 +1,42 @@
+From 3af58e59d32d6770518aee0df40d509624964662 Mon Sep 17 00:00:00 2001
+From: Jesse Keating <jkeating at redhat.com>
+Date: Tue, 15 May 2012 13:42:47 -0700
+Subject: [PATCH] Use the right argument for dasd module options
+
+The legacy argument is DASD=, and the new arguments should be the same
+as the arguments for populating dasd.conf. If multiple arguments are
+passed we can stack them by inserting a ',' between them.
+---
+ modules.d/95dasd_mod/parse-dasd-mod.sh | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
+index b550156..d7e8664 100755
+--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
++++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
+@@ -1,12 +1,20 @@
+ #!/bin/sh
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+-[ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
++mod_args=""
++for dasd_arg in $(getargs rd.dasd= rd_DASD= DASD=); do
++ if [ -z $mod_args ]; then
++ mod_args="$dasd_arg"
++ else
++ # We've already got some thing in mod_args, add to it
++ mod_args="$mod_args,$dasd_arg"
++ fi
++done
+
+-dasd_arg=$(getarg rd.dasd_mod.dasd rd_DASD_MOD=)
+-if [ -n "$dasd_arg" ]; then
+- echo "options dasd_mod dasd=$dasd_arg" >> /etc/modprobe.d/dasd_mod.conf
++if [ ! -z $mod_args ]; then
++ [ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
++ echo "options dasd_mod dasd=$mod_args" >> /etc/modprobe.d/dasd_mod.conf
+ fi
+-unset dasd_arg
+
++unset dasd_arg
+ dasd_cio_free
diff --git a/0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch b/0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
new file mode 100644
index 0000000..a18e083
--- /dev/null
+++ b/0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
@@ -0,0 +1,43 @@
+From 31aac08efb2f3be4e44d8d242aeb81e34c3c21b1 Mon Sep 17 00:00:00 2001
+From: Jesse Keating <jkeating at redhat.com>
+Date: Fri, 18 May 2012 14:06:54 -0700
+Subject: [PATCH] Translate dasd arg contents into proper dasd.conf
+
+This uses a (new) s390utils utility to normalize the range we might get
+in a dasd argument and generates a properly formatted output for
+dasd.conf.
+---
+ modules.d/95dasd/module-setup.sh | 2 +-
+ modules.d/95dasd/parse-dasd.sh | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh
+index 88dfc6d..74efc7b 100755
+--- a/modules.d/95dasd/module-setup.sh
++++ b/modules.d/95dasd/module-setup.sh
+@@ -18,7 +18,7 @@ installkernel() {
+
+ install() {
+ inst_hook cmdline 30 "$moddir/parse-dasd.sh"
+- dracut_install tr dasdinfo dasdconf.sh
++ dracut_install tr dasdinfo dasdconf.sh normalize_dasd_arg
+ if [[ $hostonly ]]; then
+ inst /etc/dasd.conf
+ fi
+diff --git a/modules.d/95dasd/parse-dasd.sh b/modules.d/95dasd/parse-dasd.sh
+index 4aeecd5..b3d18fa 100755
+--- a/modules.d/95dasd/parse-dasd.sh
++++ b/modules.d/95dasd/parse-dasd.sh
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+-for dasd_arg in $(getargs rd.dasd 'rd_DASD='); do
++for dasd_arg in $(getargs rd.dasd= rd_DASD= DASD=); do
+ (
+ IFS=","
+ set $dasd_arg
+- echo "$@" >> /etc/dasd.conf
++ echo "$@" | normalize_dasd_arg >> /etc/dasd.conf
+ )
+ done
diff --git a/0038-Normalize-dasd-argument-content-for-dasd.conf.patch b/0038-Normalize-dasd-argument-content-for-dasd.conf.patch
new file mode 100644
index 0000000..674cf5a
--- /dev/null
+++ b/0038-Normalize-dasd-argument-content-for-dasd.conf.patch
@@ -0,0 +1,38 @@
+From 8578a381ef5ba6798c40a4666fd5b0763fe4b2ea Mon Sep 17 00:00:00 2001
+From: Jesse Keating <jkeating at redhat.com>
+Date: Fri, 18 May 2012 14:50:20 -0700
+Subject: [PATCH] Normalize dasd argument content for dasd.conf
+
+Also overwrite any existing files, contents from CMSCONFFILE override
+any boot arguments.
+---
+ modules.d/80cms/cmssetup.sh | 4 ++--
+ modules.d/80cms/module-setup.sh | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
+index 6aa456c..995bfa7 100755
+--- a/modules.d/80cms/cmssetup.sh
++++ b/modules.d/80cms/cmssetup.sh
+@@ -169,8 +169,8 @@ processcmsfile()
+ fi
+
+ if [[ $DASD ]]; then
+- echo $DASD >> /etc/dasd.conf
+- echo "options dasd_mod dasd=$DASD" >> /etc/modprobe.d/dasd_mod.conf
++ echo $DASD | normalize_dasd_arg > /etc/dasd.conf
++ echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf
+ dasd_cio_free
+ fi
+
+diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh
+index 5cce1b4..15dce89 100755
+--- a/modules.d/80cms/module-setup.sh
++++ b/modules.d/80cms/module-setup.sh
+@@ -34,5 +34,5 @@ install() {
+ inst_libdir_file "gconv/*"
+ #inst /usr/lib/locale/locale-archive
+
+- dracut_install cmsfs-fuse fusermount ulockmgr_server bash tr insmod rmmod cat
++ dracut_install cmsfs-fuse fusermount ulockmgr_server bash tr insmod rmmod cat normalize_dasd_arg
+ }
diff --git a/0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch b/0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
new file mode 100644
index 0000000..39e94fe
--- /dev/null
+++ b/0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
@@ -0,0 +1,34 @@
+From 9c10fecf248838a6800d0f953c5e3bf54e452223 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 22 May 2012 11:36:41 +0200
+Subject: [PATCH] ifcfg/write-ifcfg.sh: fixed IFS resetting
+
+---
+ modules.d/45ifcfg/write-ifcfg.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
+index d1f6fe6..2b7cb5c 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
++++ b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -43,6 +43,7 @@ print_s390() {
+ local CONFIG_LINE
+ local i
+ local channel
++ local OLD_IFS
+
+ _netif="$1"
+ # if we find ccw channel, then use those, instead of
+@@ -62,9 +63,10 @@ print_s390() {
+
+ [ $? -ne 0 -o -z "$CONFIG_LINE" ] && return
+
++ OLD_IFS=$IFS
+ IFS=","
+- set $CONFIG_LINE
+- IFS="$OLD_IFS"
++ set -- $CONFIG_LINE
++ IFS=$OLD_IFS
+ NETTYPE=$1
+ shift
+ SUBCHANNELS="$1"
diff --git a/dracut.spec b/dracut.spec
index d7f434f..5cd9345 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 018
-Release: 36.git20120510%{?dist}
+Release: 40.git20120522%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -58,7 +58,12 @@ Patch31: 0031-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
Patch32: 0032-Fail-to-boot-if-mediacheck-fails-817419.patch
Patch33: 0033-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch
Patch34: 0034-Makefile-call-git2spec.pl-with-LANG-C.patch
-Patch35: 0062-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
+Patch35: 0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
+Patch36: 0036-Use-the-right-argument-for-dasd-module-options.patch
+Patch37: 0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
+Patch38: 0038-Normalize-dasd-argument-content-for-dasd.conf.patch
+Patch39: 0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
+
BuildArch: noarch
BuildRequires: dash bash git
@@ -373,6 +378,10 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Tue May 22 2012 Harald Hoyer <harald at redhat.com> 018-40.git20120522
+- fixed s390 dasd handling
+- fixed DNS bug for s390
+
* Thu May 17 2012 Dennis Gilmore <dennis at ausil.us> 018-36.git20120510
- add patch for arm storage modules
More information about the scm-commits
mailing list