for defect 3017528, seperate the "xcatdsklspost" from gettyset,

and also put xcatdsklpost to xcatpostinit, which works for both redhat and sles
thanks, Andrew(st-an-v)


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6741 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2010-07-14 09:57:05 +00:00
parent a6d8825046
commit 2ef5d53f9c
3 changed files with 9 additions and 12 deletions

View File

@ -1293,14 +1293,15 @@ sub generic_post { #This function is meant to leave the image in a state approxi
print $cfgfile " fi\n";
print $cfgfile " fi\n";
print $cfgfile "done\n";
close $cfgfile;
close($cfgfile);
chmod(0755,"$rootimg_dir/etc/init.d/gettyset");
link "$rootimg_dir/etc/init.d/gettyset", "$rootimg_dir/etc/rc3.d/S60gettyset";
system("cd $rootimg_dir/etc/rc3.d; ln -sf ../init.d/gettyset S60gettyset");
copy("$installroot/postscripts/xcatpostinit", "$rootimg_dir/etc/init.d/xcatpostinit");
chmod(0755, "$rootimg_dir/etc/init.d/xcatpostinit");
link "$rootimg_dir/etc/init.d/xcatpostinit", "$rootimg_dir/etc/rc3.d/S61xcatpostinit";
system("cd $rootimg_dir/etc/rc3.d; ln -sf ../init.d/xcatpostinit S61xcatpostinit");
}
copy(<$rootimg_dir/boot/vmlinuz*>,"$destdir/kernel"); }

View File

@ -1245,18 +1245,14 @@ sub generic_post { #This function is meant to leave the image in a state approxi
print $cfgfile "done\n";
print $cfgfile "/etc/init.d/boot.localnet start\n";
if ( $mode eq "statelite" ) {
print $cfgfile "/opt/xcat/xcatdsklspost 4\n";
}
else {
print $cfgfile "/opt/xcat/xcatdsklspost\n";
}
close($cfgfile);
chmod( 0755, "$rootimg_dir/etc/init.d/gettyset" );
system("chroot $rootimg_dir insserv gettyset");
}
copy("$installroot/postscripts/xcatpostinit", "$rootimg_dir/etc/init.d/xcatpostinit");
chmod(0755, "$rootimg_dir/etc/init.d/xcatpostinit");
system("chroot $rootimg_dir insserv gettyset xcatpostinit");
#link("$rootimg_dir/sbin/init","$rootimg_dir/init");
my $rc = system("grep sshd $rootimg_dir/etc/init.d/.depend.start");
if ($rc) {
system("sed -i '".'s/^\(TARGETS = .*\)$/\1 sshd/'."' $rootimg_dir/etc/init.d/.depend.start");

View File

@ -8,7 +8,7 @@
# Provides: xcatpostinit
# Default-Start: 3 4 5
# Default-stop: 0 1 2 6
# Required-Start:
# Required-Start: gettyset
# Required-Stop:
# Short-Description: xCATpost
# Description: xCAT post boot script