From: Andrea R. <ar...@sy...> - 2006-12-01 16:09:32
|
Author: arighi Date: 2006-12-01 10:09:16 -0600 (Fri, 01 Dec 2006) New Revision: 3823 Modified: trunk/CHANGE.LOG trunk/VERSION trunk/lib/SystemImager/Common.pm trunk/lib/SystemImager/UseYourOwnKernel.pm trunk/sbin/si_prepareclient Log: fix: use running kernel release if a custom kernel is not specified Modified: trunk/CHANGE.LOG =================================================================== --- trunk/CHANGE.LOG 2006-11-28 18:53:40 UTC (rev 3822) +++ trunk/CHANGE.LOG 2006-12-01 16:09:16 UTC (rev 3823) @@ -6,6 +6,21 @@ # $Id$ # +3.7.6 +-------------------------------------------------------------------------------- +- resolved some compiling problems in Debian +- fixed perl::threads bug for Mandriva +- built more portable RPMs between different distributions +- added si_psh (SystemImager Parallel Shell) and si_pcp (SystemImager + Parallel Copy) +- added si_mkautoinstalldisk, a tool to create autoinstall disks + (supports also USB devices) +- added --no-delete option to si_updateclient +- some fixes in the ssh transport +- better support for ppc64 architectures +- updated backend packages (LVM, devmapper, discover, rsync) +- generic bug fixes + 3.7.5 -------------------------------------------------------------------------------- - BOEL updated to kernel 2.6.18.1 Modified: trunk/VERSION =================================================================== --- trunk/VERSION 2006-11-28 18:53:40 UTC (rev 3822) +++ trunk/VERSION 2006-12-01 16:09:16 UTC (rev 3823) @@ -1 +1 @@ -3.7.5 +3.7.6r3809_arighi Modified: trunk/lib/SystemImager/Common.pm =================================================================== --- trunk/lib/SystemImager/Common.pm 2006-11-28 18:53:40 UTC (rev 3822) +++ trunk/lib/SystemImager/Common.pm 2006-12-01 16:09:16 UTC (rev 3823) @@ -292,10 +292,10 @@ # Usage: -# save_partition_information($old_sfdisk_file, $partition_tool, $destination_file, $label_type); -# save_partition_information($disk, $partition_tool, $file, $label_type); +# save_partition_information($old_sfdisk_file, $partition_tool, $destination_file, $label_type, $unit_of_measurement); +# save_partition_information($disk, $partition_tool, $file, $label_type, $unit_of_measurement); sub save_partition_information { - my ($module, $disk, $partition_tool, $file, $label_type) = @_; + my ($module, $disk, $partition_tool, $file, $label_type, $unit_of_measurement) = @_; my ($dev); if ($partition_tool eq "old_sfdisk_file") { @@ -331,12 +331,17 @@ _validate_label_type_and_partition_tool_combo($disk, $partition_tool, $label_type); } + + $unit_of_measurement = uc($unit_of_measurement); + unless (($unit_of_measurement eq '%') || ($unit_of_measurement eq 'MB')) { + die("FATAL: unsupported unit of measurement: $unit_of_measurement\n"); + } # Open up the file that we'll be putting our generic partition info in. -BEF- open (DISK_FILE, ">>$file") or die ("FATAL: Couldn't open $file for appending!"); print DISK_FILE qq(\n); - print DISK_FILE qq( <disk dev=\"$dev\" label_type=\"$label_type\" unit_of_measurement=\"MB\">\n); + print DISK_FILE qq( <disk dev=\"$dev\" label_type=\"$label_type\" unit_of_measurement=\"$unit_of_measurement\">\n); print DISK_FILE qq( <!--\n); print DISK_FILE qq( This disk's output was brought to you by the partition tool "$partition_tool",\n); Modified: trunk/lib/SystemImager/UseYourOwnKernel.pm =================================================================== --- trunk/lib/SystemImager/UseYourOwnKernel.pm 2006-11-28 18:53:40 UTC (rev 3822) +++ trunk/lib/SystemImager/UseYourOwnKernel.pm 2006-12-01 16:09:16 UTC (rev 3823) @@ -123,7 +123,7 @@ print ">>> Copying modules to new initrd from: $module_dir...\n" if( $verbose ); mkdir("$staging_dir/lib/modules", 0755) or die "$!"; unless ($my_modules) { - my $kernel_release = _get_kernel_release($custom_kernel); + my $kernel_release = ($custom_kernel) ? _get_kernel_release($custom_kernel) : $uname_r; $cmd = qq(rsync -a --exclude=build --exclude=source ) . qq($modules_to_exclude $module_dir $staging_dir/lib/modules/$kernel_release); !system( $cmd ) or die( "Couldn't $cmd." ); @@ -252,7 +252,7 @@ $kernel_file = _choose_kernel_file( $uname_r ); } unless( defined $kernel_file ) { - print "I couldn't identify your kernel file. Please try --<some-option-that-needs-to-be-added-XXX>.\n"; + print "I couldn't identify your kernel file. Please try to use --kernel option.\n"; exit 1; } Modified: trunk/sbin/si_prepareclient =================================================================== --- trunk/sbin/si_prepareclient 2006-11-28 18:53:40 UTC (rev 3822) +++ trunk/sbin/si_prepareclient 2006-12-01 16:09:16 UTC (rev 3823) @@ -152,6 +152,12 @@ Run silently. Return an exit status of 0 for success or a non-zero exit status for failure. + --unit MB | % + Use the specified unit of measurement to save disk informations. If + MB is specified the size of the partitions will be reported in + absolute values, otherwise with '%' all the values will be reported + in percentage relative to the total disk size. + --rpm-install This is only used when building an RPM. @@ -207,6 +213,7 @@ "quiet" => \my $quiet, "rpm|rpm-install" => \my $rpm, "no-uyok" => \my $no_uyok, + "unit=s" => \my $unit_of_measurement, "my-modules" => \my $my_modules, "kernel=s" => \my $custom_kernel, "modules-dir=s" => \my $modules_dir, @@ -720,7 +727,7 @@ print qq( /dev/$disk\n); print qq(\n); } - SystemImager::Common->save_partition_information($disk, $partition_tool, $file, $label_type); + SystemImager::Common->save_partition_information($disk, $partition_tool, $file, $label_type, $unit_of_measurement); } @@ -739,7 +746,7 @@ print qq( /dev/$disk\n); print qq(\n); } - SystemImager::Common->save_partition_information($disk, $partition_tool, $file, $label_type); + SystemImager::Common->save_partition_information($disk, $partition_tool, $file, $label_type, $unit_of_measurement); } |