summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl4
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc4
2 files changed, 4 insertions, 4 deletions
diff --git a/Master/install-tl b/Master/install-tl
index dbd414d103d..717a1ac1b42 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -911,7 +911,7 @@ EOF
# default in texmf/web2c/texmf.cnf is
# shell_escape = p
# so we write that only if the user *deselected* this option
- if (!$vars{"option_restricted"}) {
+ if (!$vars{"option_write18_restricted"}) {
print TMF <<EOF;
% Disable system commands via \\write18{...}. Please see
% texmf/web2c/texmf.cnf
@@ -1156,7 +1156,7 @@ sub load_tlpdb {
$vars{'option_sys_bin'} = $tlpdb->option("sys_bin");
$vars{'option_sys_man'} = $tlpdb->option("sys_man");
$vars{'option_sys_info'} = $tlpdb->option("sys_info");
- $vars{'option_restricted'} = $tlpdb->option("restricted");
+ $vars{'option_write18_restricted'} = $tlpdb->option("write18_restricted");
# check that the default scheme is actually present, otherwise switch to
# scheme-minimal
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index 37f9560cd2c..af9c21cbd22 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -11,7 +11,7 @@ longdesc installation, removal, etc.
longdesc
longdesc In the tlpsrc itself only those options are saved that are used *ONLY*
longdesc at installation time, currently opt_paper, opt_path, opt_frozen,
-longdesc and opt_restricted.
+longdesc and opt_write18_restricted.
longdesc These will longdesc be saved in the local tlpdb and will not be
longdesc accessible by tlmgr.
longdesc
@@ -42,7 +42,7 @@ longdesc are never split into .src and .doc sub-packages in the tlpdb.
depend opt_paper:a4
depend opt_path:0
-depend opt_restricted:1
+depend opt_write18_restricted:1
# if we want to make a dist frozen uncomment that and tlmgr will bail out
# telling that TLNNNN is frozen