From fb0bf30df0a03b29b0fdd5c323db10a09d593223 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 25 Jan 2012 20:31:50 +0000 Subject: [PATCH] Fix centos6 to behave like redhat does after 2.7 changes git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11414 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../xcat/install/centos/compute.centos6.tmpl | 9 ++------ .../xcat/netboot/centos/kvm.centos6.pkglist | 23 +++++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl index 64502e13a..d20c13903 100644 --- a/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl +++ b/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl @@ -1,6 +1,5 @@ #egan@us.ibm.com # -cmdline lang en_US @@ -9,7 +8,6 @@ lang en_US # nfs --server hostname.of.server or IP --dir /path/to/RH/CD/image # #nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR# -url --url http://#TABLE:noderes:$NODE:nfsserver#/install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch# #device ethernet e100 keyboard "us" @@ -32,8 +30,8 @@ clearpart --all --initlabel #No RAID #/boot really significant for this sort of setup nowadays? #part /boot --size 50 --fstype ext3 -part swap --size 1024 -part / --size 1 --grow --fstype ext4 +%include /tmp/partitioning + #RAID 0 /scr for performance #part / --size 1024 --ondisk sda @@ -79,9 +77,6 @@ bootloader install # -# text mode install (default is graphical) -# -text # # firewall diff --git a/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist b/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist index 9f3aaf09d..0b7d8ed96 100644 --- a/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist +++ b/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist @@ -1,11 +1,16 @@ -#Please make sure there is a space between @ and group name +bash +screen +dracut-network +nfs-utils +openssl +dhclient +kernel +openssh-server +openssh-clients +wget +vim-minimal +ntp +rpm +rsync libvirt qemu-kvm -screen -ntp -nfs-utils -net-snmp -rsync -yp-tools -openssh-server -util-linux-ng