From 6ce02edca5848810c5b36e09ab0479b0c8c7958d Mon Sep 17 00:00:00 2001
From: Alberto Planas <aplanas@suse.com>
Date: Fri, 25 Jul 2014 16:53:50 +0200
Subject: [PATCH] action #2958 - Remove WDUP variable.

---
 inst.d/020_bootloader.pm      | 2 +-
 inst.d/020_bootloader_uefi.pm | 2 +-
 inst.d/080_setup_xdup.pm      | 2 +-
 inst.d/200_post_xdup.pm       | 2 +-
 main.pm                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inst.d/020_bootloader.pm b/inst.d/020_bootloader.pm
index 6123677601e0..be679a049339 100644
--- a/inst.d/020_bootloader.pm
+++ b/inst.d/020_bootloader.pm
@@ -22,7 +22,7 @@ sub run() {
     }
 
     assert_screen "inst-bootmenu", 15;
-    if ( $vars{ZDUP} || $vars{WDUP} ) {
+    if ( $vars{ZDUP} ) {
         qemusend "eject -f ide1-cd0";
         qemusend "system_reset";
         sleep 10;
diff --git a/inst.d/020_bootloader_uefi.pm b/inst.d/020_bootloader_uefi.pm
index 804483677853..c911b1c66661 100644
--- a/inst.d/020_bootloader_uefi.pm
+++ b/inst.d/020_bootloader_uefi.pm
@@ -14,7 +14,7 @@ sub run() {
     if ( $vars{QEMUVGA} && $vars{QEMUVGA} ne "cirrus" ) {
         sleep 5;
     }
-    if ( $vars{ZDUP} || $vars{WDUP} ) {
+    if ( $vars{ZDUP} ) {
         qemusend "eject -f ide1-cd0";
         qemusend "system_reset";
         sleep 10;
diff --git a/inst.d/080_setup_xdup.pm b/inst.d/080_setup_xdup.pm
index 24ca3740d564..fac7e708b797 100644
--- a/inst.d/080_setup_xdup.pm
+++ b/inst.d/080_setup_xdup.pm
@@ -4,7 +4,7 @@ use bmwqemu;
 
 sub is_applicable() {
     my $self = shift;
-    return $self->SUPER::is_applicable && ($vars{ZDUP} || $vars{WDUP});
+    return $self->SUPER::is_applicable && $vars{ZDUP};
 }
 
 sub run() {
diff --git a/inst.d/200_post_xdup.pm b/inst.d/200_post_xdup.pm
index 2438176f8b98..80804519833d 100644
--- a/inst.d/200_post_xdup.pm
+++ b/inst.d/200_post_xdup.pm
@@ -3,7 +3,7 @@ use strict;
 use bmwqemu;
 
 sub is_applicable() {
-    return $vars{ZDUP} || $vars{WDUP};
+    return $vars{ZDUP};
 }
 
 sub run() {
diff --git a/main.pm b/main.pm
index ed57ab1016d9..3f5777e488ab 100755
--- a/main.pm
+++ b/main.pm
@@ -129,7 +129,7 @@ $vars{SCREENSHOTINTERVAL} ||= .5;
 save_vars(); # update variables
 
 # dump other important ENV:
-logcurrentenv(qw"ADDONURL BIGTEST BTRFS DESKTOP HW HWSLOT LIVETEST LVM MOZILLATEST NOINSTALL REBOOTAFTERINSTALL UPGRADE USBBOOT TUMBLEWEED WDUP ZDUP ZDUPREPOS TEXTMODE DISTRI NOAUTOLOGIN QEMUCPU QEMUCPUS RAIDLEVEL ENCRYPT INSTLANG QEMUVGA DOCRUN UEFI DVD GNOME KDE ISO ISO_MAXSIZE LIVECD NETBOOT NICEVIDEO NOIMAGES PROMO QEMUVGA SPLITUSR VIDEOMODE");
+logcurrentenv(qw"ADDONURL BIGTEST BTRFS DESKTOP HW HWSLOT LIVETEST LVM MOZILLATEST NOINSTALL REBOOTAFTERINSTALL UPGRADE USBBOOT TUMBLEWEED ZDUP ZDUPREPOS TEXTMODE DISTRI NOAUTOLOGIN QEMUCPU QEMUCPUS RAIDLEVEL ENCRYPT INSTLANG QEMUVGA DOCRUN UEFI DVD GNOME KDE ISO ISO_MAXSIZE LIVECD NETBOOT NICEVIDEO NOIMAGES PROMO QEMUVGA SPLITUSR VIDEOMODE");
 
 sub _wanted() {
     autotest::loadtestdir("$File::Find::name") if -d;