diff options
author | Harald Hoyer <harald@redhat.com> | 2013-09-04 13:43:12 +0200 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2013-09-04 13:43:12 +0200 |
commit | fe48c9c4e590d7ab905da3307e021b9c48545a9a (patch) | |
tree | 29503658db53c8f22eba77857925b7d33936cf2f /0009-dracut-functions.sh-inst_rules-do-not-install-from-e.patch | |
parent | b6aad2a9c88b5822b30c1686ce66dd31e2fb1a80 (diff) | |
download | dracut-fe48c9c4e590d7ab905da3307e021b9c48545a9a.tar.gz dracut-fe48c9c4e590d7ab905da3307e021b9c48545a9a.tar.xz dracut-fe48c9c4e590d7ab905da3307e021b9c48545a9a.zip |
dracut-032-23.git20130904
- fixed curl error with zero size kickstart file
Resolves: rhbz#989133
- fixed systemd-cat failure, when systemd is installed
but not actually running
Resolves: rhbz#1002021
- do not fail on empty dracut module directories
Resolves: rhbz#1003153
Diffstat (limited to '0009-dracut-functions.sh-inst_rules-do-not-install-from-e.patch')
-rw-r--r-- | 0009-dracut-functions.sh-inst_rules-do-not-install-from-e.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/0009-dracut-functions.sh-inst_rules-do-not-install-from-e.patch b/0009-dracut-functions.sh-inst_rules-do-not-install-from-e.patch new file mode 100644 index 0000000..8b3bebe --- /dev/null +++ b/0009-dracut-functions.sh-inst_rules-do-not-install-from-e.patch @@ -0,0 +1,34 @@ +From ace51ef520090e214bac2f6d98f772da0e36376a Mon Sep 17 00:00:00 2001 +From: Harald Hoyer <harald@redhat.com> +Date: Thu, 22 Aug 2013 10:53:43 +0200 +Subject: [PATCH] dracut-functions.sh:inst_rules() do not install from /etc in + generic mode + +In generic mode, local configuration should not be part of the image. + +Also handle symlinks for rule files. +--- + dracut-functions.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 87b9769..8f32f07 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -850,12 +850,14 @@ inst_rule_initqueue() { + inst_rules() { + local _target=/etc/udev/rules.d _rule _found + ++ [[ $hostonly ]] || unset hostonly ++ + inst_dir "${udevdir}/rules.d" + inst_dir "$_target" + for _rule in "$@"; do + if [ "${_rule#/}" = "$_rule" ]; then +- for r in ${udevdir}/rules.d /etc/udev/rules.d; do +- if [[ -f $r/$_rule ]]; then ++ for r in ${udevdir}/rules.d ${hostonly+/etc/udev/rules.d}; do ++ if [[ -e $r/$_rule ]]; then + _found="$r/$_rule" + inst_rule_programs "$_found" + inst_rule_group_owner "$_found" |