r1992 - Remove ifrename, reverting part of r1921

[com...@warewulf.lbl.gov]

Author: bsallen
Date: 2016-06-03 17:48:27 -0700 (Fri, 03 Jun 2016)
New Revision: 1992

Modified:
trunk/provision/lib/Warewulf/Module/Cli/Provision.pm
trunk/provision/lib/Warewulf/Provision.pm
trunk/provision/lib/Warewulf/Provision/Pxelinux.pm
Log:
Remove ifrename, reverting part of r1921

Modified: trunk/provision/lib/Warewulf/Module/Cli/Provision.pm
===================================================================
--- trunk/provision/lib/Warewulf/Module/Cli/Provision.pm 2016-06-03 22:47:55 UTC (rev 1991)
+++ trunk/provision/lib/Warewulf/Module/Cli/Provision.pm 2016-06-04 00:48:27 UTC (rev 1992)
@@ -97,7 +97,6 @@
$h .= " --bootlocal Boot the node from the local disk (\"exit\" or \"normal\")\n";
$h .= " --console Set a specific console for the kernel command line\n";
$h .= " --kargs Define the kernel arguments (assumes \"net.ifnames=0 biosdevname=0 quiet\" if UNDEF)\n";
- $h .= " --ifrename Allow kernel to rename ethernet devices (DEFAULT: 0)\n";
$h .= " --pxelinux Define a custom PXELINUX/boot image to use\n";
$h .= " --selinux Boot node with SELinux support? (valid options are: UNDEF,\n";
$h .= " ENABLED, and ENFORCED)\n";
@@ -188,7 +187,6 @@
my @opt_fileadd;
my @opt_filedel;
my $opt_kargs;
- my $opt_ifrename;
my $opt_console;
my $opt_pxelinux;
my $opt_selinux;
@@ -213,7 +211,6 @@
'fileadd=s' => \@opt_fileadd,
'filedel=s' => \@opt_filedel,
'kargs=s' => \$opt_kargs,
- 'ifrename=s' => \$opt_ifrename,
'console=s' => \$opt_console,
'pxelinux=s' => \$opt_pxelinux,
'master=s' => \@opt_master,
@@ -412,31 +409,6 @@
}
}

- if (defined($opt_ifrename)) {
- if (uc($opt_ifrename) eq "UNDEF" or
- uc($opt_ifrename) eq "FALSE" or
- uc($opt_ifrename) eq "NO" or
- uc($opt_ifrename) eq "N" or
- $opt_ifrename == 0
- ) {
- foreach my $obj ($objSet->get_list()) {
- my $name = $obj->name() || "UNDEF";
- $obj->ifrename(0);
- &dprint("Disabling ifrename for node name: $name\n");
- $persist_bool = 1;
- }
- push(@changes, sprintf(" UNDEF: %-20s\n", "IFRENAME"));
- } else {
- foreach my $obj ($objSet->get_list()) {
- my $name = $obj->name() || "UNDEF";
- $obj->ifrename(1);
- &dprint("Enabling ifrename for node name: $name\n");
- $persist_bool = 1;
- }
- push(@changes, sprintf(" SET: %-20s = %s\n", "IFRENAME", 1));
- }
- }
-
if (@opt_master) {
foreach my $obj ($objSet->get_list()) {
my $nodename = $obj->get("name") || "UNDEF";
@@ -768,7 +740,6 @@
printf("%15s: %-16s = %s\n", $name, "FILES", join(",", @files));
printf("%15s: %-16s = %s\n", $name, "PRESHELL", $o->preshell() ? "TRUE" : "FALSE");
printf("%15s: %-16s = %s\n", $name, "POSTSHELL", $o->postshell() ? "TRUE" : "FALSE");
- printf("%15s: %-16s = %s\n", $name, "IFRENAME", $o->ifrename() ? "TRUE" : "FALSE");
printf("%15s: %-16s = %s\n", $name, "CONSOLE", $o->console() || "UNDEF");
printf("%15s: %-16s = %s\n", $name, "PXELINUX", $o->pxelinux() || "UNDEF");
printf("%15s: %-16s = %s\n", $name, "SELINUX", $o->selinux() || "UNDEF");

Modified: trunk/provision/lib/Warewulf/Provision/Pxelinux.pm
===================================================================
--- trunk/provision/lib/Warewulf/Provision/Pxelinux.pm 2016-06-03 22:47:55 UTC (rev 1991)
+++ trunk/provision/lib/Warewulf/Provision/Pxelinux.pm 2016-06-04 00:48:27 UTC (rev 1992)
@@ -147,7 +147,6 @@
my $bootstrapid = $nodeobj->get("bootstrapid");
my $db_id = $nodeobj->id();
my $console = $nodeobj->console();
- my $ifrename = $nodeobj->ifrename();
my @kargs = $nodeobj->kargs();
my $bootlocal = $nodeobj->bootlocal();
my @masters = $nodeobj->get("master");

Modified: trunk/provision/lib/Warewulf/Provision.pm
===================================================================
--- trunk/provision/lib/Warewulf/Provision.pm 2016-06-03 22:47:55 UTC (rev 1991)
+++ trunk/provision/lib/Warewulf/Provision.pm 2016-06-04 00:48:27 UTC (rev 1992)
@@ -422,32 +422,6 @@
}


-=item ifrename($value)
-
-Set or return ifrename
-
-Value is boolean:
- true: >= 1
- false: <= 0
-
-=cut
-
-sub
-ifrename()
-{
- my ($self, $value) = @_;
-
- if (defined($value)) {
- if ($value <= 0) {
- $self->set("ifrename", 0);
- } else {
- $self->set("ifrename", 1);
- }
- }
-
- return $self->get("ifrename") || 0;
-}
-
=item bootlocal($value)

Set or return bootlocal: