summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data-boot/gfxboot.cfg19
-rw-r--r--data-install/gfxboot.cfg19
-rw-r--r--src/common.inc22
-rw-r--r--src/dia_install.inc215
4 files changed, 5 insertions, 270 deletions
diff --git a/data-boot/gfxboot.cfg b/data-boot/gfxboot.cfg
index 1e51bd8..21526da 100644
--- a/data-boot/gfxboot.cfg
+++ b/data-boot/gfxboot.cfg
@@ -107,25 +107,6 @@ mediacheck=mediachk
nobootoptions=harddisk,memtest
; main menu items that are not passed an 'install' parameter
noinstallopt=harddisk,firmware,memtest
-; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom)
-install=
-; default repo location
-install.http.server=
-install.http.path=
-install.nfs.server=
-install.nfs.path=
-install.ftp.server=
-install.ftp.path=
-install.ftp.user=
-install.ftp.password=
-install.smb.server=
-install.smb.share=
-install.smb.path=
-install.smb.domain=
-install.smb.user=
-install.smb.password=
-install.hd.device=
-install.hd.path=
; default driver update (one of: yes, no, file, url; default: no)
dud=
; if 'dud=file': file name on DVD
diff --git a/data-install/gfxboot.cfg b/data-install/gfxboot.cfg
index d4c2b2a..dce6035 100644
--- a/data-install/gfxboot.cfg
+++ b/data-install/gfxboot.cfg
@@ -107,25 +107,6 @@ mediacheck=mediachk
nobootoptions=harddisk,memtest
; main menu items that are not passed an 'install' parameter
noinstallopt=harddisk,firmware,memtest
-; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom)
-install=
-; default repo location
-install.http.server=
-install.http.path=
-install.nfs.server=
-install.nfs.path=
-install.ftp.server=
-install.ftp.path=
-install.ftp.user=
-install.ftp.password=
-install.smb.server=
-install.smb.share=
-install.smb.path=
-install.smb.domain=
-install.smb.user=
-install.smb.password=
-install.hd.device=
-install.hd.path=
; default driver update (one of: yes, no, file, url; default: no)
dud=
; if 'dud=file': file name on DVD
diff --git a/src/common.inc b/src/common.inc
index 736eb67..2ff9e9f 100644
--- a/src/common.inc
+++ b/src/common.inc
@@ -1585,28 +1585,6 @@ ptheme {
/keymap.mainmenu "keymap.mainmenu" false gfxconfig.set.bool
/keymap.default "keymap" "" gfxconfig.set.str
-/install.default "install" "" gfxconfig.set.str
-/install.http.server "install.http.server" "" gfxconfig.set.str
-/install.http.path "install.http.path" "" gfxconfig.set.str
-
-/install.nfs.server "install.nfs.server" "" gfxconfig.set.str
-/install.nfs.path "install.nfs.path" "" gfxconfig.set.str
-
-/install.ftp.server "install.ftp.server" "" gfxconfig.set.str
-/install.ftp.path "install.ftp.path" "" gfxconfig.set.str
-/install.ftp.user "install.ftp.user" "" gfxconfig.set.str
-/install.ftp.password "install.ftp.password" "" gfxconfig.set.str
-
-/install.smb.server "install.smb.server" "" gfxconfig.set.str
-/install.smb.share "install.smb.share" "" gfxconfig.set.str
-/install.smb.path "install.smb.path" "" gfxconfig.set.str
-/install.smb.domain "install.smb.domain" "" gfxconfig.set.str
-/install.smb.user "install.smb.user" "" gfxconfig.set.str
-/install.smb.password "install.smb.password" "" gfxconfig.set.str
-
-/install.hd.device "install.hd.device" "" gfxconfig.set.str
-/install.hd.path "install.hd.path" "" gfxconfig.set.str
-
/dud.default "dud" "" gfxconfig.set.str
/dud.file "dud.file" "" gfxconfig.set.str
/dud.url "dud.url" "" gfxconfig.set.str
diff --git a/src/dia_install.inc b/src/dia_install.inc
index 635146f..23cf426 100644
--- a/src/dia_install.inc
+++ b/src/dia_install.inc
@@ -12,12 +12,7 @@
% install types
/.inst_cdrom 0 def
-/.inst_slp 1 def
-/.inst_ftp 2 def
-/.inst_http 3 def
-/.inst_nfs 4 def
-/.inst_smb 5 def
-/.inst_hd 6 def
+/.inst_other 1 def
/install.last .inst_cdrom def
@@ -31,18 +26,10 @@
/xmenu xmenu.install def
- /input.edit.ftp [ 63 string 127 string 31 string 31 string ] def
- /input.edit.http [ 63 string 127 string ] def
- /input.edit.nfs [ 63 string 127 string ] def
- /input.edit.smb [ 63 string 31 string 127 string 31 string 31 string 31 string ] def
- /input.edit.hd [ 63 string 127 string ] def
-
- install.read.config
-
xmenu .xm_current install.last put
% see install types (.inst_*)
- xmenu .xm_list [ is_dvd { "DVD" } { "CD-ROM" } ifelse "SLP" "FTP" "HTTP" "NFS" "SMB / CIFS" /txt_harddisk ] put
+ xmenu .xm_list [ is_dvd { "DVD" } { "CD-ROM" } ifelse "Other" ] put
xmenu .xm_title /txt_install_source put
@@ -58,16 +45,11 @@
/install.update {
/xmenu xmenu.install def
- xmenu .xm_current get dup .inst_cdrom eq exch .inst_slp eq or {
/install.last xmenu .xm_current get def
install.set.install.option
/window.action actRedrawPanel def
- } {
- install.dialog
- }
- ifelse
} def
@@ -116,87 +98,6 @@
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/install.dialog {
-
- /dia window.dialog def
-
- dia .text "" put
-
- xmenu .xm_current get
-
- dup .inst_ftp eq {
- dia .title txt_ftp_title put
-
- % Must all be of same size!
- dia .ed.list 4 array put
- dia .ed.buffer.list input.edit.ftp put
- dia .ed.text.list [ txt_server txt_directory txt_user1 txt_password ] put
-
- dia .ed.font font.normal put
- dia .ed.pw_field 3 put
-
- } if
-
- dup .inst_http eq {
- dia .title txt_http_title put
-
- % Must all be of same size!
- dia .ed.list 2 array put
- dia .ed.buffer.list input.edit.http put
- dia .ed.text.list [ txt_server txt_directory ] put
-
- } if
-
- dup .inst_nfs eq {
- dia .title txt_nfs_title put
-
- % Must all be of same size!
- dia .ed.list 2 array put
- dia .ed.buffer.list input.edit.nfs put
- dia .ed.text.list [ txt_server txt_directory ] put
-
- } if
-
- dup .inst_smb eq {
- dia .title txt_smb_title put
-
- % Must all be of same size!
- dia .ed.list 6 array put
- dia .ed.buffer.list input.edit.smb put
- dia .ed.text.list [ txt_server txt_share txt_directory txt_domain txt_user2 txt_password ] put
-
- dia .ed.font font.normal put
- dia .ed.pw_field 5 put
-
- } if
-
- dup .inst_hd eq {
- dia .title txt_harddisk_title put
-
- % Must all be of same size!
- dia .ed.list 2 array put
- dia .ed.buffer.list input.edit.hd put
- dia .ed.text.list [ txt_hd_diskdevice txt_directory ] put
-
- } if
-
- pop
-
- dia .ed.focus 0 put
- dia .ed.width 300 put
-
- dia .buttons [
- button.ok button.default actInstallOK actNoClose or button.setaction
- button.cancel button.notdefault actInstallCancel button.setaction
- config.rtl { exch } if
- ] put
-
- dia window.init
- dia window.show
-
-} def
-
-
/install.ok {
/xmenu xmenu.install def
@@ -209,8 +110,6 @@
pmenu.update
- install.set.install.option
-
} def
@@ -229,116 +128,12 @@
/install.set.install.option {
xmenu .xm_current get
- % default: .inst_cdrom
+ % default: .inst_other
install.option "" strcpy pop
- dup .inst_slp eq {
- install.option "install=slp:/" strcpy pop
- } if
-
- dup .inst_ftp eq {
- input.edit.ftp
-
- "install=ftp://" install.option sprintf
-
- % add user name & password
- dup 2 get "" ne {
- dup 2 get "%s" install.option dup length add sprintf
- dup 3 get "" ne {
- dup 3 get ":%s" install.option dup length add sprintf
- } if
- "@" install.option dup length add sprintf
- } if
-
- dup 1 get exch 0 get "%s/%s" install.option dup length add sprintf
- } if
-
- dup .inst_http eq {
- input.edit.http
- dup 1 get dup 0 get '/' eq { 1 add } if
- exch 0 get
- "install=http://%s/%s" install.option sprintf
- } if
-
- dup .inst_nfs eq {
- input.edit.nfs
- dup 1 get dup 0 get '/' eq { 1 add } if
- exch 0 get
- "install=nfs://%s/%s" install.option sprintf
- } if
-
- dup .inst_smb eq {
- input.edit.smb
-
- "install=smb://" install.option sprintf
-
- % add domain
- dup 3 get "" ne {
- dup 3 get "%s;" install.option dup length add sprintf
- } if
-
- % add user name & password
- dup 4 get "" ne {
- dup 4 get "%s" install.option dup length add sprintf
- dup 5 get "" ne {
- dup 5 get ":%s" install.option dup length add sprintf
- } if
- "@" install.option dup length add sprintf
- } if
-
- dup 2 get dup 0 get '/' eq { 1 add } if
- over 1 get rot 0 get
- "%s/%s/%s" install.option dup length add sprintf
+ dup .inst_cdrom eq {
+ install.option "automatic=method:cdrom" strcpy pop
} if
- dup .inst_hd eq {
- input.edit.hd
- dup 1 get dup 0 get '/' eq { 1 add } if
- exch 0 get dup 0 get '/' eq { 1 add } if
- "install=hd://%s/%s" install.option sprintf
- } if
-
- pop
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Read default values.
-%
-% ( -- )
-%
-/install.read.config {
- install.default
- dup "cdrom" eq { /install.last .inst_cdrom def } if
- dup "slp" eq { /install.last .inst_slp def } if
- dup "ftp" eq { /install.last .inst_ftp def } if
- dup "http" eq { /install.last .inst_http def } if
- dup "nfs" eq { /install.last .inst_nfs def } if
- dup "smb" eq { /install.last .inst_smb def } if
- dup "hd" eq { /install.last .inst_hd def } if
pop
-
- input.edit.http 0 get install.http.server strcpy pop
- input.edit.http 1 get install.http.path strcpy pop
-
- input.edit.nfs 0 get install.nfs.server strcpy pop
- input.edit.nfs 1 get install.nfs.path strcpy pop
-
- input.edit.ftp 0 get install.ftp.server strcpy pop
- input.edit.ftp 1 get install.ftp.path strcpy pop
- input.edit.ftp 2 get install.ftp.user strcpy pop
- input.edit.ftp 3 get install.ftp.password strcpy pop
-
- input.edit.smb 0 get install.smb.server strcpy pop
- input.edit.smb 1 get install.smb.share strcpy pop
- input.edit.smb 2 get install.smb.path strcpy pop
- input.edit.smb 3 get install.smb.domain strcpy pop
- input.edit.smb 4 get install.smb.user strcpy pop
- input.edit.smb 5 get install.smb.password strcpy pop
-
- input.edit.hd 0 get install.hd.device strcpy pop
- input.edit.hd 1 get install.hd.path strcpy pop
-
} def
-
-