Changeset 890 in MondoRescue

Timestamp:

Oct 10, 2006, 10:34:13 AM (18 years ago)

Author:

Bruno Cornec

Message:

• mondo depends on mindi > 1.2.0 now
• As I redeliver I also fix a remaining bug for bonding

Location:

branches/2.2.0

Files:

• mondo/distributions/rpm/mondo.spec (modified) (1 diff)
• mondo/mondo/common/libmondo-files.c (modified) (1 diff)
• tools/build2pkg (modified) (1 diff)

branches/2.2.0/mondo/distributions/rpm/mondo.spec

@@ -19 +19 @@
 ExcludeArch:    ppc
 OBS
-Requires:   mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
+Requires:   mindi >= 1.2.0, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 %ifarch ia64
 Requires:   elilo, parted

branches/2.2.0/mondo/mondo/common/libmondo-files.c

@@ -1285 +1285 @@
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
         sprintf(command,
-                "ifconfig %s | awk '{print $5}'", nfs_dev);
+                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
         sprintf(command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev );
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
         strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
         log_to_screen("Replacing it with %s\n", nfs_dev);

branches/2.2.0/tools/build2pkg

@@ -83 +83 @@
             status=-1
         else
-            export pkg1="`egrep '^Wrote:' $log | grep -v debuginfo | cut -d: -f2`"
+            export pkg1="`egrep '^Wrote:' $log | grep -v debug | cut -d: -f2`"
             if [ -f /usr/bin/rpmlint ]; then
                 /usr/bin/rpmlint $pkg1