installer: Add proxy support.
* gnu/installer/proxy.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add it. * po/guix/POTFILES.in: Add it. * gnu/installer/newt/parameters.scm (run-proxy-page): New procedure, (run-parameters-page): add the previous procedure to the parameters menu.master
parent
07a53bd512
commit
ee0ad7803c
|
@ -17,6 +17,7 @@
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu installer newt parameters)
|
(define-module (gnu installer newt parameters)
|
||||||
|
#:use-module (gnu installer proxy)
|
||||||
#:use-module (gnu installer steps)
|
#:use-module (gnu installer steps)
|
||||||
#:use-module (gnu installer newt page)
|
#:use-module (gnu installer newt page)
|
||||||
#:use-module (guix i18n)
|
#:use-module (guix i18n)
|
||||||
|
@ -24,11 +25,22 @@
|
||||||
#:use-module (newt)
|
#:use-module (newt)
|
||||||
#:export (run-parameters-page))
|
#:export (run-parameters-page))
|
||||||
|
|
||||||
|
(define (run-proxy-page)
|
||||||
|
(define proxy
|
||||||
|
(run-input-page (G_ "Please enter the HTTP proxy URL. If you enter an \
|
||||||
|
empty string, proxy usage will be disabled.")
|
||||||
|
(G_ "HTTP proxy configuration")
|
||||||
|
#:allow-empty-input? #t))
|
||||||
|
(if (string=? proxy "")
|
||||||
|
(clear-http-proxy)
|
||||||
|
(set-http-proxy proxy)))
|
||||||
|
|
||||||
(define (run-parameters-page keyboard-layout-selection)
|
(define (run-parameters-page keyboard-layout-selection)
|
||||||
"Run a parameters page allowing to change the keyboard layout"
|
"Run a parameters page allowing to change the keyboard layout"
|
||||||
(let* ((items
|
(let* ((items
|
||||||
(list
|
(list
|
||||||
(cons (G_ "Change keyboard layout") keyboard-layout-selection)))
|
(cons (G_ "Change keyboard layout") keyboard-layout-selection)
|
||||||
|
(cons (G_ "Configure HTTP proxy") run-proxy-page)))
|
||||||
(result
|
(result
|
||||||
(run-listbox-selection-page
|
(run-listbox-selection-page
|
||||||
#:info-text (G_ "Please choose one of the following parameters or \
|
#:info-text (G_ "Please choose one of the following parameters or \
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (gnu installer proxy)
|
||||||
|
#:use-module (gnu services herd)
|
||||||
|
#:export (set-http-proxy
|
||||||
|
clear-http-proxy))
|
||||||
|
|
||||||
|
(define-syntax-rule (with-silent-shepherd exp ...)
|
||||||
|
(parameterize ((shepherd-message-port
|
||||||
|
(%make-void-port "w")))
|
||||||
|
exp ...))
|
||||||
|
|
||||||
|
(define (set-http-proxy proxy)
|
||||||
|
(with-silent-shepherd
|
||||||
|
(with-shepherd-action 'guix-daemon
|
||||||
|
('set-http-proxy proxy)
|
||||||
|
result
|
||||||
|
result)))
|
||||||
|
|
||||||
|
(define (clear-http-proxy)
|
||||||
|
(with-silent-shepherd
|
||||||
|
(with-shepherd-action 'guix-daemon
|
||||||
|
('set-http-proxy)
|
||||||
|
result
|
||||||
|
result)))
|
||||||
|
|
||||||
|
;; Local Variables:
|
||||||
|
;; eval: (put 'with-silent-shepherd 'scheme-indent-function 0)
|
||||||
|
;; End:
|
|
@ -662,6 +662,7 @@ INSTALLER_MODULES = \
|
||||||
%D%/installer/locale.scm \
|
%D%/installer/locale.scm \
|
||||||
%D%/installer/newt.scm \
|
%D%/installer/newt.scm \
|
||||||
%D%/installer/parted.scm \
|
%D%/installer/parted.scm \
|
||||||
|
%D%/installer/proxy.scm \
|
||||||
%D%/installer/record.scm \
|
%D%/installer/record.scm \
|
||||||
%D%/installer/services.scm \
|
%D%/installer/services.scm \
|
||||||
%D%/installer/steps.scm \
|
%D%/installer/steps.scm \
|
||||||
|
|
|
@ -31,6 +31,7 @@ gnu/installer/newt/utils.scm
|
||||||
gnu/installer/newt/welcome.scm
|
gnu/installer/newt/welcome.scm
|
||||||
gnu/installer/newt/wifi.scm
|
gnu/installer/newt/wifi.scm
|
||||||
gnu/installer/parted.scm
|
gnu/installer/parted.scm
|
||||||
|
gnu/installer/proxy.scm
|
||||||
gnu/installer/record.scm
|
gnu/installer/record.scm
|
||||||
gnu/installer/services.scm
|
gnu/installer/services.scm
|
||||||
gnu/installer/steps.scm
|
gnu/installer/steps.scm
|
||||||
|
|
Reference in New Issue