action os-autoinst#2958 - Remove WDUP variable.

aplanas · Jul 25, 2014 · 6ce02ed · 6ce02ed
1 parent e6c64da
commit 6ce02ed
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;