From 63ca0b981144950fdea1b3b519c828180091c648 Mon Sep 17 00:00:00 2001 From: ligc Date: Thu, 11 Jun 2015 03:18:09 -0400 Subject: [PATCH] Preliminary code for PowerKVM 3.1 support --- xCAT-server/lib/xcat/plugins/anaconda.pm | 10 +++-- .../install/pkvm/compute.pkvm3.ppc64le.tmpl | 43 +++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 xCAT-server/share/xcat/install/pkvm/compute.pkvm3.ppc64le.tmpl diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 2c24fd90d..2a2e43f7b 100755 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -1302,12 +1302,16 @@ sub mkinstall ) ) or ( $arch =~ /ppc/ - and -r "$pkgdir/ppc/ppc64/vmlinuz" - and $kernpath = "$pkgdir/ppc/ppc64/vmlinuz" + and ((-r "$pkgdir/ppc/ppc64/vmlinuz" + and $kernpath = "$pkgdir/ppc/ppc64/vmlinuz") + or (-r "$pkgdir/ppc/ppc64le/vmlinuz" + and $kernpath = "$pkgdir/ppc/ppc64le/vmlinuz")) and ((-r "$pkgdir/ppc/ppc64/ramdisk.image.gz" and $initrdpath = "$pkgdir/ppc/ppc64/ramdisk.image.gz") or (-r "$pkgdir/ppc/ppc64/initrd.img" - and $initrdpath = "$pkgdir/ppc/ppc64/initrd.img"))) + and $initrdpath = "$pkgdir/ppc/ppc64/initrd.img") + or (-r "$pkgdir/ppc/ppc64le/initrd.img" + and $initrdpath = "$pkgdir/ppc/ppc64le/initrd.img"))) ) { #TODO: driver slipstream, targetted for network. diff --git a/xCAT-server/share/xcat/install/pkvm/compute.pkvm3.ppc64le.tmpl b/xCAT-server/share/xcat/install/pkvm/compute.pkvm3.ppc64le.tmpl new file mode 100644 index 000000000..8a8cbcc6b --- /dev/null +++ b/xCAT-server/share/xcat/install/pkvm/compute.pkvm3.ppc64le.tmpl @@ -0,0 +1,43 @@ +# +# Select a zone +# Add the --utc switch if your hardware clock is set to GMT +# +#timezone US/Hawaii +#timezone US/Pacific +#timezone US/Mountain +#timezone US/Central +#timezone US/Eastern +timezone --utc "#TABLE:site:key=timezone:value#" + +# +# Don't do X +# +#skipx + + +# +# To generate an encrypted root password use: +# +# perl -e 'print crypt("blah","Xa") . "\n";'p +# openssl passwd -apr1 -salt xxxxxxxx password +# +# where "blah" is your root password. +# +rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# + +#partition / --ondisk=/dev/mapper/ibmpkvm_vg_root-ibmpkvm_lv_root +partition / --ondisk=/dev/sda +#the --devicename must specify right now, but without network command, it can also work, so we delete it. +#network --bootproto dhcp + +%post +touch "/startpost" + +#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat# +touch "/inpost" + +#sleep 1000000 + + +%end +