drop -t support for genimage, defect 3520753

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12306 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2012-04-23 20:52:58 +00:00
parent efaa159718
commit d5a3ec70db
2 changed files with 15 additions and 11 deletions

View File

@ -6,9 +6,9 @@ B<genimage> - Generates a stateless image to be used for a diskless install.
B<genimage>
B<genimage> B<-o> I<osver> [B<-a> I<arch>] B<-p> I<profile> B<-i> I<nodebootif> B<-n> I<nodenetdrivers> [B<-r> I<otherifaces>] [B<-k> I<kernelver>] [B<-g> I<krpmver>] [B<-m> I<statelite>] [B<-l> I<rootlimitsize>] [B<-t> I<tmplimitsize>] [B<--permission> I<permission>] [B<--interactive>]
B<genimage> B<-o> I<osver> [B<-a> I<arch>] B<-p> I<profile> B<-i> I<nodebootif> B<-n> I<nodenetdrivers> [B<-r> I<otherifaces>] [B<-k> I<kernelver>] [B<-g> I<krpmver>] [B<-m> I<statelite>] [B<-l> I<rootlimitsize>] [B<--permission> I<permission>] [B<--interactive>]
B<genimage> [B<-o> I<osver>] [B<-a> I<arch>] [B<-p> I<profile>] [B<-i> I<nodebootif>] [B<-n> I<nodenetdrivers>] [B<-r> I<otherifaces>] [B<-k> I<kernelver>] [B<-g> I<krpmver>] [B<-m> I<statelite>] [B<-l> I<rootlimitsize>] [B<-t> I<tmplimitsize>] [B<--permission> I<permission>] [B<--interactive>] I<imagename>
B<genimage> [B<-o> I<osver>] [B<-a> I<arch>] [B<-p> I<profile>] [B<-i> I<nodebootif>] [B<-n> I<nodenetdrivers>] [B<-r> I<otherifaces>] [B<-k> I<kernelver>] [B<-g> I<krpmver>] [B<-m> I<statelite>] [B<-l> I<rootlimitsize>] [B<--permission> I<permission>] [B<--interactive>] I<imagename>
B<genimage> [B<-h> | B<--help> | B<-v> | B<--version>]
@ -129,6 +129,10 @@ This flag is for Ubuntu, Debian and Fedora12 only. Use this flag to specify if y
This flag allows the user to answer questions from yum/zypper command when installing rpms into the image. If it is not specified, '-y' will be passed to the yum command and '--non-interactive --no-gpg-checks' will be passed to the zypper command as default answers.
=item B<-t> I<tmplimit>
(Deprecated) This flag allows the user to setup the /tmp and the /var/tmp file system sizes. This flag is no longer supported. You can overwrite any file system size using the .postinstall script where you can create a new /etc/fstab file.
=item B<-v|--version>

View File

@ -1305,7 +1305,6 @@ END
}
}
#copy conf files needed by nfs mount in sles11.2
if($osver_host == 11)
{
@ -1313,6 +1312,7 @@ END
system("cp -r $rootimg_dir/etc/netconfig /tmp/xcatinitrd.$$/etc/");
}
# Copy udev libraries
system("mkdir -p /tmp/xcatinitrd.$$/etc/udev");
system("mkdir -p /tmp/xcatinitrd.$$/lib/firmware");
@ -1324,18 +1324,18 @@ END
system("cp -r $rootimg_dir/usr/bin/killall /tmp/xcatinitrd.$$/usr/bin");
# Copy rules for network adapter
# my $name = `cat /etc/sysconfig/network/ifcfg-$prinic | grep NAME`;
# my $nic = '';
# if ($name =~ m/(\d+\.\d+\.\d+)/g) {
# $nic = $&;
# }
#my $name = `cat /etc/sysconfig/network/ifcfg-$prinic | grep NAME`;
#my $nic = '';
#if ($name =~ m/(\d+\.\d+\.\d+)/g) {
# $nic = $&;
#}
# Somehow checking for *$nic.rules does not work
#if ( -f "/etc/udev/rules.d/*$nic.rules" ) {
# system("cp -r /etc/udev/rules.d/*$nic.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
# system("cp -r /etc/udev/rules.d/*$nic.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
#}
#if ( -f "/etc/udev/rules.d/*persistent-net.rules" ) {
# system("cp -r /etc/udev/rules.d/*persistent-net.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
# system("cp -r /etc/udev/rules.d/*persistent-net.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
#}
system("mkdir -p /tmp/xcatinitrd.$$/lib/udev");
@ -1669,7 +1669,7 @@ sub load_dd()
}
sub usage {
print 'Usage: genimage -o <OSVER> [-a <arch>] -p <profile> -i <nodebootif> -n <nodenetdrivers> [-r <otherifaces>] [-k <kernelver>] [-g <krpmver>] [-l rootlimitsize] [-t tmplimitsize] [--permission <permission>] [--interactive]'."\n";
print 'Usage: genimage -o <OSVER> [-a <arch>] -p <profile> -i <nodebootif> -n <nodenetdrivers> [-r <otherifaces>] [-k <kernelver>] [-g <krpmver>] [-l rootlimitsize] [--permission <permission>] [--interactive]'."\n";
print " --permission is used for statelite only\n";
print "Examples:\n";
print " genimage -i eth0 -n tg3 -o sles11 -p compute\n";