https://bugzilla.novell.com/show_bug.cgi?id=713126
https://bugzilla.novell.com/show_bug.cgi?id=713126#c3
--- Comment #3 from Olaf Hering 2013-08-04 16:26:47 CEST ---
The initial issue is maybe fixed.
Current Factory still puts duplicate files, once in /lib/firmware and once in
/usr/lib/firmware. The reason is the symlink /usr/lib/firmware from udev.rpm.
This patch avoids the duplicate files, and the duplicate output.
index 4736709..6fda9ea 100644
--- a/scripts/setup-modules.sh
+++ b/scripts/setup-modules.sh
@@ -320,6 +320,10 @@ fi
# Copy all modules into the initrd
has_firmware=false
+declare -A fw_array
+mkdir -p $tmp_mnt/lib/firmware
+mkdir -p $tmp_mnt/usr/lib
+ln -sfbn ../../lib/firmware $tmp_mnt/usr/lib/firmware
for module in $resolved_modules; do
if [ ! -r $root_dir/$module ]; then
oops 9 "Module $module not found."
@@ -340,7 +344,11 @@ for module in $resolved_modules; do
echo -ne "Firmware:\t"
has_firmware=true
fi
- echo -n "$fw "
+ if test -z "${fw_array[$fw]}"
+ then
+ fw_array[$fw]=$fw
+ echo -n "$fw "
+ fi
if test -e "$dir/$subdir/$fw.sig"; then
cp -p --parents "$_" "$tmp_mnt"
echo -n "$fw.sig "
--
Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.