adapt "dud" to mandriva stage1 para (updatemodules)

2 files changed, 2 insertions, 107 deletions

diff --git a/src/common.inc b/src/common.inc
index 2ff9e9f..a32d52e 100644
--- a/src/common.inc
+++ b/src/common.inc
@@ -419,21 +419,9 @@
   } if
 
   xmenu.dud {
-    xmenu.dud .xm_current get .dud_url eq {
-      input.edit.dud_url 0 get dup "" ne {
-        "dud=%s " bc.cmd dup length add sprintf
-      } { pop } ifelse
-    } {
-      xmenu.dud .xm_current get .dud_file eq {
-        input.edit.dud_file 0 get dup "" ne {
-          "driverupdate=%s " bc.cmd dup length add sprintf
-        } { pop } ifelse
-      } {
         dud.options xmenu.dud .xm_current get get dup "" ne {
           "%s " bc.cmd dup length add sprintf
         } { pop } ifelse
-      } ifelse
-    } ifelse
   } if
 
   xmenu.profile {
@@ -462,60 +450,6 @@
     } loop
   } forall free
 
-  bc.cmd "driverupdate" bootopt.find dup .undef ne {
-    % exclude 'driverupdate=0 and driverupdate=1'
-    "driverupdate=" length get
-    dup '0' ne exch '1' ne and {
-
-      /bc.tmp bc.cmd "driverupdate" bootopt.remove def
-      bc.tmp .undef ne {
-        /bc.tmp bc.tmp "driverupdate=" length add ',' split bc.tmp free def
-        /bc.tmp2 cmdlinelength string def
-
-        bc.tmp2 "initrd=" strcpy pop
-
-        bc.tmp length 0 gt {
-          % add '+' to first arg unless it starts with '+' or '-'
-          bc.tmp 0 get 0 get
-          dup '-' eq {	% remove '-'
-            bc.tmp 0 get dup 1 add strdup exch free
-            bc.tmp exch 0 exch put
-            pop '+'
-          } if
-          '+' ne {		% add '+'
-            bc.tmp 0 get length 1 add string "+" strcat bc.tmp 0 get strcat
-            bc.tmp 0 get free bc.tmp exch 0 exch put
-          } if
-
-          bc.tmp length 1 sub -1 0 {
-            bc.tmp exch get
-            bc.tmp2 exch strcat "," strcat pop
-          } for
-        } if
-
-        bc.tmp dup { free } forall free
-
-        % last 'initrd' option
-        /bc.tmp .undef def
-        {
-          bc.cmd "initrd" bootopt.remove dup .undef ne {
-            bc.tmp free /bc.tmp exch def
-          } {
-            pop exit
-          } ifelse
-        } loop
-
-        % re-add new 'initrd' option
-        bc.tmp {
-          bc.tmp2 bc.tmp "initrd=" length add strcat pop
-          bc.tmp free
-          bc.cmd bc.tmp2 strcat " " strcat pop
-        } if
-      } if
-
-    } if
-  } { pop } ifelse
-
   syslinux {
     % find out initrd sizes for kernel loading progress bar
     bc.cmd "initrd" bootopt.find dup .undef ne {
@@ -1586,9 +1520,6 @@ ptheme {
 /keymap.default        "keymap"                      "" gfxconfig.set.str
 
 /dud.default           "dud"                         "" gfxconfig.set.str
-/dud.file              "dud.file"                    "" gfxconfig.set.str
-/dud.url               "dud.url"                     "" gfxconfig.set.str
-/dud.url.name          "dud.url.name"                "" gfxconfig.set.str
 
 /serial.line0          "serial.line0"               [ ] gfxconfig.set.array_str
 /serial.line1          "serial.line1"               [ ] gfxconfig.set.array_str
diff --git a/src/dia_dud.inc b/src/dia_dud.inc
index 647965c..2b49627 100644
--- a/src/dia_dud.inc
+++ b/src/dia_dud.inc
@@ -10,16 +10,12 @@
 %
 /.dud_yes	0 def
 /.dud_no	1 def
-/.dud_file	2 def
-/.dud_url	3 def
 
 /dud.last .dud_no def
 
 /dud.options [
-  "dud=1"
+  "updatemodules"
   ""
-  .undef
-  .undef
 ] def
 
 
@@ -33,13 +29,10 @@
 
   /xmenu xmenu.dud def
 
-  /input.edit.dud_file [ 127 string ] def
-  /input.edit.dud_url [ 127 string ] def
-
   dud.read.config
 
   xmenu .xm_current dud.last put
-  xmenu .xm_list [ /txt_yes /txt_no /txt_file dud.url.name ] put
+  xmenu .xm_list [ /txt_yes /txt_no ] put  
 
   xmenu .xm_title /txt_driver_update put
 } def
@@ -53,9 +46,6 @@
 /dud.update {
   /xmenu xmenu.dud def
 
-  xmenu .xm_current get dup .dud_file eq over .dud_url eq or {
-    dud.dialog
-  } if
   /window.action actRedrawPanel def
 } def
 
@@ -109,24 +99,6 @@
 
   xmenu .xm_current get
 
-  dup .dud_file eq {
-    dia .title txt_driver_update2 put
-
-    % Must all be of same size!
-    dia .ed.list 1 array put
-    dia .ed.buffer.list input.edit.dud_file put
-    dia .ed.text.list [ txt_dud_file_msg ] put
-  } if
-
-  dup .dud_url eq {
-    dia .title txt_dud_download put
-
-    % Must all be of same size!
-    dia .ed.list 1 array put
-    dia .ed.buffer.list input.edit.dud_url put
-    dia .ed.text.list [ txt_dud_enter_url ] put
-  } if
-
   pop
 
   dia .ed.focus 0 put
@@ -153,13 +125,5 @@
   dud.default
   dup "yes"  eq { /dud.last .dud_yes def } if
   dup "no"   eq { /dud.last .dud_no def } if
-  dup "file" eq { /dud.last .dud_file def } if
-  dup "url"  eq { /dud.last .dud_url def } if
   pop
-
-  input.edit.dud_file 0 get dud.file strcpy pop
-  input.edit.dud_url  0 get dud.url  strcpy pop
-
-  dud.url.name "" eq { /dud.url.name "URL" def } if
-
 } def