From 8bcc4b66adfbe8e7aae8aff8c4c1b2ae6ff5535a Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 1 Feb 2008 14:33:31 +0000 Subject: [PATCH] Fix initrd generation to be more generic for ppc/x86 in stateless fedora 8 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@374 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/share/xcat/netboot/fedora/genimage | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/genimage b/xCAT-server-2.0/share/xcat/netboot/fedora/genimage index c19aef66a..fa4bd61f5 100755 --- a/xCAT-server-2.0/share/xcat/netboot/fedora/genimage +++ b/xCAT-server-2.0/share/xcat/netboot/fedora/genimage @@ -76,6 +76,12 @@ sub getlibs { my @libs = split/\n/,$liblist; my @return; foreach (@libs) { + unless (/=>/) { + (my $wjnk, my $lib,my $jnk) = split /\s+/,$_,3; + $lib =~ s/^\///; + $libhash{$lib}=1; + next; + } (my $temp1,my $temp2) = split />/,$_,2; (my $whitespace,$temp1,$temp2) = split /\s+/,$temp2,4; unless ($temp1 =~ /\//) { @@ -92,7 +98,9 @@ sub mkinitrd { mkpath("/tmp/xcatinitrd.$$/usr/bin"); mkpath("/tmp/xcatinitrd.$$/usr/sbin"); mkpath("/tmp/xcatinitrd.$$/usr/lib"); + mkpath("/tmp/xcatinitrd.$$/usr/lib64"); mkpath("/tmp/xcatinitrd.$$/lib/firmware"); + mkpath("/tmp/xcatinitrd.$$/lib64/firmware"); mkpath("/tmp/xcatinitrd.$$/proc"); mkpath("/tmp/xcatinitrd.$$/sys"); mkpath("/tmp/xcatinitrd.$$/dev/mapper"); @@ -170,7 +178,7 @@ sub mkinitrd { close($inifile); chmod(0755,"/tmp/xcatinitrd.$$/init"); chmod(0755,"/tmp/xcatinitrd.$$/bin/netstart"); - @filestoadd=("lib/ld.so.1"); + @filestoadd=(); foreach ("sbin/nash","sbin/busybox.anaconda","sbin/rmmod") { getlibs($_); push @filestoadd,$_;