Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
tails
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
955
Issues
955
List
Boards
Labels
Service Desk
Milestones
Merge Requests
13
Merge Requests
13
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tails
tails
Commits
8c45b567
Commit
8c45b567
authored
Oct 21, 2014
by
Tails developers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Actually, only "source" the variable assignment we expect.
parent
7fc7e680
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
config/chroot_local-includes/usr/local/sbin/unsafe-browser
config/chroot_local-includes/usr/local/sbin/unsafe-browser
+3
-2
No files found.
config/chroot_local-includes/usr/local/sbin/unsafe-browser
View file @
8c45b567
...
...
@@ -100,11 +100,12 @@ if [ -r "${NM_ENV_FILE}" ]; then
# script. Note that while the regex used for deciding IP addresses
# is far from perfect, it serves our purpose here.
IP4_REGEX
=
'[0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{3\}'
if
grep
-v
"^IP4_NAMESERVERS=
\"
${
IP4_REGEX
}
\"
$"
"
${
NM_ENV_FILE
}
"
;
then
NAMESERVERS_REGEX
=
"^IP4_NAMESERVERS=
\"
${
IP4_REGEX
}
\"
$"
if
grep
-v
"
${
NAMESERVERS_REGEX
}
"
"
${
NM_ENV_FILE
}
"
;
then
error
"
`
gettext
\"
NetworkManager passed us garbage data when trying to deduce the clearnet DNS server.
\"
`
"
fi
# Import the IP4_NAMESERVERS variable.
.
"
${
NM_ENV_FILE
}
"
eval
"
$(
grep
"
${
NAMESERVERS_REGEX
}
"
"
${
NM_ENV_FILE
}
"
)
"
fi
# ... otherwise fail.
# FIXME: Or would it make sense to fallback to Google's DNS or OpenDNS?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment