diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 8205ae693..1c85f18cd 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -73,6 +73,7 @@ my %distnames = ( "1241464993.830723" => "rhas4.8", #x86-64 "1273608367.051780" => "SL5.5", #x86_64 DVD ISO + "1299104542.844706" => "SL6", #x86_64 DVD ISO ); my %numdiscs = ( "1156364963.862322" => 4, @@ -554,9 +555,9 @@ sub mknetboot } # special case for redhat6, fedora12/13/14 - if ($osver =~ m/rhel6/ || $osver =~ m/rhels6/ + if ($osver =~ m/rhel6/ || $osver =~ m/rhels6/ || $osver =~ m/fedora12/ || $osver =~ m/fedora13/ - || $osver =~ m/fedora14/ ) { + || $osver =~ m/fedora14/ || $osver =~ m/SL6/) { $kcmdline = "root=nfs:$nfssrv:$nfsdir/rootimg:ro STATEMNT="; } else { $kcmdline = "NFSROOT=$nfssrv:$nfsdir STATEMNT="; @@ -728,27 +729,28 @@ sub mknetboot # special case for the dracut-enabled OSes if ($osver =~ m/rhels6/ || $osver =~ m/rhel6/ || $osver =~ m/fedora12/ || $osver =~ m/fedora13/ - || $osver =~ m/fedora14/ ) { + || $osver =~ m/fedora14/ || $osver =~ m/SL6/) { if($statelite and $rootfstype eq "ramdisk") { $initrdstr = "xcat/netboot/$osver/$arch/$profile/initrd-stateless.gz"; } } - - if($statelite) - { - my $statelitetb = xCAT::Table->new('statelite'); - my $mntopts = $statelitetb->getAttribs({node => $node}, 'mntopts'); - - my $mntoptions = $mntopts->{'mntopts'}; - unless (defined($mntoptions)) - { - $kcmdline .= " MNTOPTS="; - } - else - { - $kcmdline .= " MNTOPTS=$mntoptions"; - } - } + + if($statelite) + { + my $statelitetb = xCAT::Table->new('statelite'); + my $mntopts = $statelitetb->getAttribs({node => $node}, 'mntopts'); + + my $mntoptions = $mntopts->{'mntopts'}; + unless (defined($mntoptions)) + { + $kcmdline .= " MNTOPTS="; + } + else + { + $kcmdline .= " MNTOPTS=$mntoptions"; + } + } + $bptab->setNodeAttribs( $node, { diff --git a/xCAT-server/share/xcat/install/SL/compute.SL6.pkglist b/xCAT-server/share/xcat/install/SL/compute.SL6.pkglist new file mode 120000 index 000000000..a2ac48243 --- /dev/null +++ b/xCAT-server/share/xcat/install/SL/compute.SL6.pkglist @@ -0,0 +1 @@ +../rh/compute.rhels6.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/SL/compute.SL6.tmpl b/xCAT-server/share/xcat/install/SL/compute.SL6.tmpl new file mode 120000 index 000000000..c5c95df5a --- /dev/null +++ b/xCAT-server/share/xcat/install/SL/compute.SL6.tmpl @@ -0,0 +1 @@ +../rh/compute.rhels6.tmpl \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/compute.SL6.pkglist b/xCAT-server/share/xcat/netboot/SL/compute.SL6.pkglist new file mode 120000 index 000000000..a2ac48243 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/compute.SL6.pkglist @@ -0,0 +1 @@ +../rh/compute.rhels6.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/dracut/check b/xCAT-server/share/xcat/netboot/SL/dracut/check new file mode 120000 index 000000000..87ffb9d77 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/dracut/check @@ -0,0 +1 @@ +../../rh/dracut/check \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/dracut/install.netboot b/xCAT-server/share/xcat/netboot/SL/dracut/install.netboot new file mode 120000 index 000000000..642f46713 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/dracut/install.netboot @@ -0,0 +1 @@ +../../rh/dracut/install.netboot \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/dracut/install.statelite b/xCAT-server/share/xcat/netboot/SL/dracut/install.statelite new file mode 120000 index 000000000..a29fbcca1 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/dracut/install.statelite @@ -0,0 +1 @@ +../../rh/dracut/install.statelite \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/dracut/installkernel b/xCAT-server/share/xcat/netboot/SL/dracut/installkernel new file mode 120000 index 000000000..65990228e --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/dracut/installkernel @@ -0,0 +1 @@ +../../rh/dracut/installkernel \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/dracut/xcat-cmdline.sh b/xCAT-server/share/xcat/netboot/SL/dracut/xcat-cmdline.sh new file mode 120000 index 000000000..76c6651f6 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/dracut/xcat-cmdline.sh @@ -0,0 +1 @@ +../../rh/dracut/xcat-cmdline.sh \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/dracut/xcat-prepivot.sh b/xCAT-server/share/xcat/netboot/SL/dracut/xcat-prepivot.sh new file mode 120000 index 000000000..d2b623c6c --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/dracut/xcat-prepivot.sh @@ -0,0 +1 @@ +../../rh/dracut/xcat-prepivot.sh \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/SL/dracut/xcatroot b/xCAT-server/share/xcat/netboot/SL/dracut/xcatroot new file mode 120000 index 000000000..babd2fb9d --- /dev/null +++ b/xCAT-server/share/xcat/netboot/SL/dracut/xcatroot @@ -0,0 +1 @@ +../../rh/dracut/xcatroot \ No newline at end of file