[dracut/f17] dracut-018-26.git20120424
Harald Hoyer
harald at fedoraproject.org
Tue Apr 24 14:17:59 UTC 2012
commit d35a424b92b6c730c94283135ba5621600fc08d3
Author: Harald Hoyer <harald at redhat.com>
Date: Tue Apr 24 16:16:57 2012 +0200
dracut-018-26.git20120424
- fixed progress bar for TERM=dumb
Resolves: rhbz#814713
- add DNS to ifcfg for NM takeover
Resolves: rhbz#815369
...te-DNS1-.-for-nameserver-args-RHBZ-815369.patch | 31 ++++++++++++++++++
...on-t-add-existing-handlers-multiple-times.patch | 27 +++++++++++++++
...-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch | 34 ++++++++++++++++++++
dracut.spec | 11 ++++++-
4 files changed, 102 insertions(+), 1 deletions(-)
---
diff --git a/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch b/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
new file mode 100644
index 0000000..e803f06
--- /dev/null
+++ b/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
@@ -0,0 +1,31 @@
+From 1d506b0319ef69d605d4bce0082b982f8a2f877c Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 24 Apr 2012 13:08:57 +0200
+Subject: [PATCH] ifcfg: write DNS1=... for nameserver= args (RHBZ#815369)
+
+If you're using a static network config, you'll want to keep your
+nameservers around when NM starts. Write DNS1 (and DNS2, DNS3, etc..)
+into the ifcfg file.
+
+Thanks to Mark Hamzy <hamzy at us.ibm.com>
+and Will Woods <wwoods at redhat.com> for the patch.
+---
+ modules.d/45ifcfg/write-ifcfg.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
+index c072a13..b81ac39 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
++++ b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -138,6 +138,11 @@ for netif in $IFACES ; do
+ } >> /tmp/ifcfg/ifcfg-$ethname
+ fi
+ fi
++ i=1
++ for ns in $(getargs nameserver); do
++ echo "DNS${i}=${ns}" >> /tmp/ifcfg/ifcfg-$netif
++ i=$((i+1))
++ done
+ done
+
+ # Pass network opts
diff --git a/0024-url-lib-don-t-add-existing-handlers-multiple-times.patch b/0024-url-lib-don-t-add-existing-handlers-multiple-times.patch
new file mode 100644
index 0000000..4bda97a
--- /dev/null
+++ b/0024-url-lib-don-t-add-existing-handlers-multiple-times.patch
@@ -0,0 +1,27 @@
+From 3a64317d8e42892ec1035d0610e95ce77e8c2791 Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods at redhat.com>
+Date: Fri, 20 Apr 2012 16:20:24 -0400
+Subject: [PATCH] url-lib: don't add existing handlers multiple times
+
+Every time url-lib gets imported we end up making the list of handlers
+longer with redundant entries. That's silly - we shouldn't add items
+that already exist.
+
+Note that this means you'll have to manipulate the handler list yourself
+if you want to change the position/priority of existing handlers.
+---
+ modules.d/45url-lib/url-lib.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
+index e305a68..7930146 100755
+--- a/modules.d/45url-lib/url-lib.sh
++++ b/modules.d/45url-lib/url-lib.sh
+@@ -43,6 +43,7 @@ add_url_handler() {
+ local schemes="$@" scheme=""
+ set --
+ for scheme in $schemes; do
++ [ "$(get_url_handler $scheme)" = "$handler" ] && continue
+ set -- "$@" "$scheme:$handler"
+ done
+ set -- $@ $url_handler_map # add new items to *front* of list
diff --git a/0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch b/0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
new file mode 100644
index 0000000..3c5ddef
--- /dev/null
+++ b/0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
@@ -0,0 +1,34 @@
+From ad619415d6d14d539fe5268b491e0c2963836d64 Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods at redhat.com>
+Date: Fri, 20 Apr 2012 16:20:25 -0400
+Subject: [PATCH] url-lib: don't use --progress-bar if TERM=dumb (RHBZ#814713)
+
+Basically, s390 is the only place I've ever seen TERM=dumb, and it's too
+dumb to handle '\r', so --progress-bar produces waaaaay too much output.
+
+The normal progress meter only prints something once per second, so
+that's reasonable on terminals where '\r' doesn't work.
+
+See also: https://bugzilla.redhat.com/show_bug.cgi?id=814713
+---
+ modules.d/45url-lib/url-lib.sh | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
+index 7930146..5721294 100755
+--- a/modules.d/45url-lib/url-lib.sh
++++ b/modules.d/45url-lib/url-lib.sh
+@@ -54,7 +54,12 @@ add_url_handler() {
+
+ export CURL_HOME="/run/initramfs/url-lib"
+ mkdir -p $CURL_HOME
+-curl_args="--location --retry 3 --fail --show-error --progress-bar"
++curl_args="--location --retry 3 --fail --show-error"
++
++# technically "dumb" can handle the progress bar, but the only thing I've ever
++# seen using TERM=dumb is s390 CMS, and it's too dumb for --progress-bar
++[ "$TERM" != "dumb" ] && curl_args="$curl_args --progress-bar"
++
+ curl_fetch_url() {
+ local url="$1" outloc="$2"
+ echo "$url" > /proc/self/fd/0
diff --git a/dracut.spec b/dracut.spec
index c973437..64bbd52 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 018
-Release: 23.git20120419%{?dist}
+Release: 26.git20120424%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -46,6 +46,9 @@ Patch19: 0019-network-module-setup.sh-include-all-kernel-drivers-n.patch
Patch20: 0020-add-pre-pivot-cleanup-hook.patch
Patch21: 0021-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
Patch22: 0022-network-parse-ip-opts.sh-remove-check-for-netroot.patch
+Patch23: 0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
+Patch24: 0024-url-lib-don-t-add-existing-handlers-multiple-times.patch
+Patch25: 0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
BuildArch: noarch
@@ -361,6 +364,12 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Tue Apr 24 2012 Harald Hoyer <harald at redhat.com> 018-26.git20120424
+- fixed progress bar for TERM=dumb
+Resolves: rhbz#814713
+- add DNS to ifcfg for NM takeover
+Resolves: rhbz#815369
+
* Thu Apr 19 2012 Harald Hoyer <harald at redhat.com> 018-23.git20120419
- fixed vnc installation
- do not ignore ram devices in udev
More information about the scm-commits
mailing list