Andrea Righi wrote:
> Tory M Blue wrote:
>> note what it's in my grub.conf after the mess
>>
>> # This file is generated by System Configurator. #
>> ##################################################
>> # The number of seconds to wait before booting.
>> timeout 5
>> # The default kernel image to boot.
>> default 0
>> # The splash image (this line will be empty if nothing was found)
>> splashimage=/grub/splash.xpm.gz
>>
>> # kernel0
>> title fc6xen-virt_
>>         root
>>         kernel  ro root=LABEL=/ ro root=LABEL=/  console=xvc0
>>         initrd
>>
> 
> We also need to patch UYOK stuff. See create_systemconfig_conf() in
> sbin/si_prepareclient.
> 

Tory, David,

could you check if the following patch fixes both your problems?

Thanks,
-Andrea
---

Index: lib/SystemImager/UseYourOwnKernel.pm
===================================================================
--- lib/SystemImager/UseYourOwnKernel.pm        (revision 4390)
+++ lib/SystemImager/UseYourOwnKernel.pm        (working copy)
@@ -345,18 +345,30 @@
         #
         # and not a directory
         if( -d $file )   { return undef; }
+        #
+        # skip symlinks
+        if( -l $file )   { return undef; }
+        #
+        # skip .bak files
+        if( $file =~ /\.bak$/ )   { return undef; }
+        #
+        # eliminate vmlinux files on RH
+        if( $file =~ m/^vmlinux$/ ) { return undef; }
+        #
+        # eliminate ramdisks
+        if( $file =~ m/initrd/ ) { return undef; }
+        #
+        # eliminate memtest
+        if( $file =~ m/^memtest/ ) { return undef; }
+        #
+        # eliminate message
+        if( $file =~ m/^message/ ) { return undef; }
 
         #
         # Get output from "file" for elimination by identification tests
-        my $cmd = "file -b $file";
+        my $cmd = "file -bz $file";
         open(INPUT,"$cmd|") or die("Couldn't run $cmd to get INPUT");
                 my ($input) = (<INPUT>);
-                #
-                # eliminate vmlinux files on RH
-                if( $input =~ m/ELF (32|64)-bit LSB executable,/ ) { return 
undef; }
-                #
-                # eliminate compressed data (eg. ramdisk)
-                if( $input =~ m/gzip compressed data,/ ) { return undef; }
                 # eliminate cpio archives (eg. ramdisk)
                 if( $input =~ m/cpio archive/ ) { return undef; }
                 # eliminate cramfs files (eg. ramdisk)

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
sisuite-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sisuite-users

Reply via email to