Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Tom Yan
archiso
Commits
a9a4dc4f
Verified
Commit
a9a4dc4f
authored
Jun 04, 2021
by
David Runge
🐿
Browse files
Merge remote-tracking branch 'nl6720/env-i'
* nl6720/env-i: archiso/mkarchiso: clear environment variables when chrooting
parents
0bc62940
3d6651ab
Changes
1
Hide whitespace changes
Inline
Side-by-side
archiso/mkarchiso
View file @
a9a4dc4f
...
...
@@ -324,13 +324,12 @@ _make_packages() {
if
[[
-n
"
${
gpg_key
}
"
]]
;
then
exec
{
ARCHISO_GNUPG_FD
}
<
>
"
${
work_dir
}
/pubkey.gpg"
export
ARCHISO_GNUPG_FD
fi
if
[[
"
${
quiet
}
"
=
"y"
]]
;
then
pacstrap
-C
"
${
work_dir
}
/
${
buildmode
}
.pacman.conf"
-c
-G
-M
--
"
${
pacstrap_dir
}
"
"
${
buildmode_pkg_list
[@]
}
"
&> /dev/null
env
-i
"ARCHISO_GNUPG_FD=
${
ARCHISO_GNUPG_FD
}
"
pacstrap
-C
"
${
work_dir
}
/
${
buildmode
}
.pacman.conf"
-c
-G
-M
--
"
${
pacstrap_dir
}
"
"
${
buildmode_pkg_list
[@]
}
"
&> /dev/null
else
pacstrap
-C
"
${
work_dir
}
/
${
buildmode
}
.pacman.conf"
-c
-G
-M
--
"
${
pacstrap_dir
}
"
"
${
buildmode_pkg_list
[@]
}
"
env
-i
"ARCHISO_GNUPG_FD=
${
ARCHISO_GNUPG_FD
}
"
pacstrap
-C
"
${
work_dir
}
/
${
buildmode
}
.pacman.conf"
-c
-G
-M
--
"
${
pacstrap_dir
}
"
"
${
buildmode_pkg_list
[@]
}
"
fi
if
[[
-n
"
${
gpg_key
}
"
]]
;
then
...
...
@@ -372,7 +371,7 @@ _make_customize_airootfs() {
_msg_info
"Running customize_airootfs.sh in '
${
pacstrap_dir
}
' chroot..."
_msg_warning
"customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
chmod
-f
--
+x
"
${
pacstrap_dir
}
/root/customize_airootfs.sh"
eval
--
arch-chroot
"
${
pacstrap_dir
}
"
"/root/customize_airootfs.sh"
eval
--
env
-i
arch-chroot
"
${
pacstrap_dir
}
"
"/root/customize_airootfs.sh"
rm
--
"
${
pacstrap_dir
}
/root/customize_airootfs.sh"
_msg_info
"Done! customize_airootfs.sh run successfully."
fi
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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