Changeset 2850 in MondoRescue for branches/2.2.10/mindi/mindi-get-perl-modules

Timestamp:

Jul 24, 2011, 4:12:44 AM (13 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2773:2849 2.2.9 in 2.2.10

• Adds 3 binaries called potentially by udev o support USB key mount at restore time (Victor Gattegno)
• Really support both mkisofs and genisoimage everywhere
• Try to handle netfs_user better in all cases (NFS and SSHFS)
  • Improve logging in init script
  • Format improvement
  • Removes a warning when trying to launch udevadm and it doesn't exist (RHEL 5 e.g.)
  • Fix syntax description in mondoarchive man page for -E & -I with |
• Adds download entries for new distro supported (Mageia, Fedora 15, Ubuntu 11.04)

-Fix mindi-get-perl-modules when perl dirs in @INC are symlinks (case on Ubuntu 11.04)

• Fix option --findkernel in case of Xen kernel so that mondoarchive get a correct answer instead of an empty one.
• Fix multi-media restore by umounting it before looping to ask for the next (as if already mounted, will not pass to the next alone)
• Fix 485 by replacing a wrong call to mr_asprintf which was provoking core dumped.
• Fix -E and -I example in man page which were lacking the '|' as separator
• Fix #484 by adding support for the arcmsr driver (to support the Areca ARC-1220 RAID Controller)
  • Avoids error msgs if no mondo-restore.cfg file exists (when mindi used stdalone)
  • Adds the swapon feature to mindi-busybox
  • Attempt to fix Xen kernel support by avoiding to remove xen kernel fro; the possible_kernels list too early, whereas it's used afterwards to get them.
  • Fix #481 by supporting the new kbd file in latest Ubuntu 10.10+ (victor.gattegno_at_hp.com)
• Update from Lester Wade on P2V doc including RHEL6 validation and some minor additions
• removes telinit call in busybox o try to fix problems whn reboot at end of restore.
• if -E option for mondoarchive was not specified, variable excp points to NULL, so string exclude_pathes contained '(null)' instead of being avoided (derived from a patch from taguchi_at_ff.iij4u.or.jp)
• fix -maxdepth option for find command. it sould be '-maxdepth .. -name ..', not '-name .. -maxdepth ..' (patch from taguchi_at_ff.iij4u.or.jp)
• Adds an extraversion for revision support
• Adds support for ifconfig and ping for PXE+NFS boot for this version of mindi-busybox
• Example of MINDI_ADDITIONAL_BOOT_PARAMS in mindi.conf added
• fix a compilation error
• Remove an absolute ref in the docs web page

File:

• branches/2.2.10/mindi/mindi-get-perl-modules (modified) (3 diffs)

branches/2.2.10/mindi/mindi-get-perl-modules

@@ -6 +6 @@
 
 use File::Find;
+use Cwd;
 
 my $file = get_perl_modules(@ARGV) if (defined $ARGV[0]);
@@ -28 +29 @@
 #
 foreach my $d (@INC) {
+    $d = read_all_link($d) if (-l $d);
     push @includes,$d if (-d $d);
 }
@@ -53 +55 @@
 }
 
+# Cf: http://www.stonehenge.com/merlyn/UnixReview/col27.html
+sub read_all_link {
+
+my $dir = cwd;
+my $link;
+
+find sub {
+    return unless -l;
+    my @right = split /\//, $File::Find::name;
+    my @left = do {
+        @right && ($right[0] eq "") ?
+        shift @right :            # quick way
+        split /\//, $dir;
+    };    # first element always null
+    while (@right) {
+        my $item = shift @right;
+        next if $item eq "." or $item eq "";
+        if ($item eq "..") {
+            pop @left if @left > 1;
+            next;
+        }
+        my $link = readlink (join "/", @left, $item);
+        if (defined $link) {
+            my @parts = split /\//, $link;
+            if (@parts && ($parts[0] eq "")) { # absolute
+                @left = shift @parts;   # quick way
+            }
+        unshift @right, @parts;
+        next;
+        } else {
+            push @left, $item;
+            next;
+        }
+    }
+    #print "$File::Find::name is ", join("/", @left), "\n";
+    $link = join("/", @left);
+}, @_;
+return($link);
+}
+
 # Adapted From /usr/lib/rpm/mandriva/perl.req
 # by Ken Estes Mail.com kestes@staff.mail.com