diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 7a434f962..2253c8adf 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -1103,7 +1103,7 @@ sub mkinstall $instserver=$ent->{nfsserver}; } my $kcmdline = - "instserver=$instserver ks=http://" + "repo=http://$instserver/install/$os/$arch/ ks=http://" . $instserver . "/install/autoinst/" . $node; @@ -1180,7 +1180,7 @@ sub mkinstall $kcmdline .= "n8r"; } } - $kcmdline .= " noipv6"; + #$kcmdline .= " noipv6"; # add the addkcmdline attribute to the end # of the command, if it exists #my $addkcmd = $addkcmdhash->{$node}->[0]; diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl index 9ffa7b55b..1f0523000 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl @@ -8,7 +8,7 @@ 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# +%include /tmp/installurl #device ethernet e100 keyboard "us" diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh index ae28e93a4..c329496d3 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.rh +++ b/xCAT-server/share/xcat/install/scripts/pre.rh @@ -137,6 +137,9 @@ fi if [ -d /sys/firmware/efi ]; then echo 'part /boot/efi --size 50 --fstype vfat' >> /tmp/partitioning fi +INSTSERVER=`sed -e 's/.*instserver=.*//' -e 's/ .*//' /proc/cmdline` +echo "url --url http://$INSTSERVER/"'install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch#' > /tmp/installurl + #TODO: ondisk detection, /dev/disk/by-id/edd-int13_dev80 for legacy maybe, and no idea about efi. at least maybe blacklist SAN if mptsas/mpt2sas/megaraid_sas seen... echo "part swap --size 1024" >> /tmp/partitioning echo "part / --size 1 --grow --fstype $FSTYPE" >> /tmp/partitioning