From 0c9cc10542e03e69e272022acebf95f6fb3008b5 Mon Sep 17 00:00:00 2001 From: mxi1 Date: Mon, 13 Apr 2009 13:39:03 +0000 Subject: [PATCH] -Remove 2 postinstall workarounds; Comment otherpkgs repository in .repolist git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3173 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../share/xcat/netboot/sles/service.sles11.postinstall | 7 ------- .../share/xcat/netboot/sles/service.sles11.ppc64.repolist | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall b/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall index 5ccdd2668..201599be0 100755 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall @@ -36,11 +36,6 @@ cat <>$installroot/etc/hosts `getent hosts $HOSTNAME` END -cat <>$installroot/root/.bashrc -export XCATHOST=$HOSTNAME:3001 -END - - #Prevent DHCP from starting up until xcatd has had a chance to configure it: chroot $installroot chkconfig dhcpd off chroot $installroot chkconfig dhcrelay off @@ -64,8 +59,6 @@ TMP_inittab=`sed 's/\(#\)\(cons:12345.*\)$/\2/' $installroot/etc/inittab` echo "$TMP_inittab" > $installroot/etc/inittab -#copy /etc/xcat/cfgloc to rootimg -cp /etc/xcat/cfgloc $installroot/etc/xcat #-- Example of booted image versioning #-- We want to know, with what configuration (version of the image) each node was booted. #-- Hence, we keep image definition files and postscripts in CVS. During image generation we create file /etc/IMGVERSION and fill it with CVS "$Id$" of files with image definition (.pkglist, .exlist, .repolist, .postinstall). Then, during boot, each "CVS enabled" postscript (see /install/postscripts/cvs_template.sh and /install/postscripts/cvs_template.pl) adds one line to /etc/IMGVERSION. Then you can determine in any time what image you are running and what postscipts in which versions were run. diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist index 771b1f94b..1d871ba27 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist @@ -10,4 +10,4 @@ #Plaindir|file:/install/sles10sp2/x86_64/custom|custom rpm-md|http://xcat.sourceforge.net/yum/xcat-dep/sles11/ppc64|xcat-dep rpm-md|http://xcat.sourceforge.net/yum/devel/core-snap|core-snap -plaindir|file:///install/post/otherpkgs/sles11/ppc64|otherpkgs +#plaindir|file:///install/post/otherpkgs/sles11/ppc64|otherpkgs