diff options
author | Harald Hoyer <harald@redhat.com> | 2013-12-05 17:38:32 +0100 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2013-12-05 17:38:32 +0100 |
commit | 4734ecf5fb38aeaf2fceaefa64564eecb9cc900e (patch) | |
tree | bd0c4d117624e4cedd707e0ed0c92310faf3870c /0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch | |
parent | 55473f736f925ea2c16f1e55760cee3e8b4e8544 (diff) | |
download | dracut-4734ecf5fb38aeaf2fceaefa64564eecb9cc900e.tar.gz dracut-4734ecf5fb38aeaf2fceaefa64564eecb9cc900e.tar.xz dracut-4734ecf5fb38aeaf2fceaefa64564eecb9cc900e.zip |
dracut-034-62.git20131205
- fixed PATH shortener
- also install /etc/system-fips in the initramfs
- nbd, do not fail in hostonly mode
- add ohci-pci to the list of hardcoded modules
- lvm: do not run pvscan for lvmetad
- network fixes
- skip crypt swaps with password files
- fixed i18n
Diffstat (limited to '0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch')
-rw-r--r-- | 0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch b/0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch new file mode 100644 index 0000000..f03ac35 --- /dev/null +++ b/0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch @@ -0,0 +1,43 @@ +From 1d50dfe6025126c38b1d23815360bd48e9e8c24c Mon Sep 17 00:00:00 2001 +From: Colin Guthrie <colin@mageia.org> +Date: Sat, 2 Nov 2013 11:26:30 +0000 +Subject: [PATCH] dracut-functions.sh: Avoid loading unnecessary 32-bit + libraries for 64-bit initrds + +Due to the 'inst_libdir_file "libnss_files*"' in the udev-rules module +this caues the /usr/lib/libnss_files-2.18.so* to be included. This is a +32-bit library and pulls in a 32-bit version of glibc also even on a +64-bit system. + +This is due to the fact that ldconfig -pN will print [/usr]/lib paths +from the cache as well as [/usr]/lib64. As we handle these paths +specifically we should ignore these results from the cache. + +Also there was a missing space when appending the ldconfig paths +onto our list meaning the last builtin and first ldconfig path +were unusable. +--- + dracut-functions.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 38095ba..2872516 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -65,6 +65,7 @@ ldconfig_paths() + printf "%s\n" ${d%/*}; + done + ); do ++ [[ "$i" = "/lib" || "$i" = "/usr/lib" || "$i" = "/lib64" || "$i" = "/usr/lib64" ]] && continue + a["$i"]=1; + done; + printf "%s\n" ${!a[@]} +@@ -81,7 +82,7 @@ if ! [[ $libdirs ]] ; then + [[ -d /usr/lib ]] && libdirs+=" /usr/lib" + fi + +- libdirs+="$(ldconfig_paths)" ++ libdirs+=" $(ldconfig_paths)" + + export libdirs + fi |