QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename function chroot to chroot_cmd

Browse Source 
Do not create function with the same name as standard command, it is
very confusing.

Fixes QubesOS/qubes-issues#1174
This commit is contained in:
Marek Marczykowski-Górecki 2016-04-20 01:59:34 +02:00
parent f51e3a09fe
commit b427341d28
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.sh
View File

@ -65,7 +65,7 @@ if [ ! "$build_already_defined_colors" = "true" ]; then
fi fi
if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
chroot() { chroot_cmd() {
# Display `chroot` or `systemd-nspawn` in blue ONLY if VERBOSE >= 2 # Display `chroot` or `systemd-nspawn` in blue ONLY if VERBOSE >= 2
# or DEBUG == "1" # or DEBUG == "1"
local retval local retval
@ -82,7 +82,7 @@ if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
return $retval return $retval
} }
else else
chroot() { chroot_cmd() {
if [ "${SYSTEMD_NSPAWN_ENABLE}" == "1" ]; then if [ "${SYSTEMD_NSPAWN_ENABLE}" == "1" ]; then
systemd-nspawn $systemd_bind -D "${INSTALLDIR}" -M "${DIST}" ${1+"$@"} systemd-nspawn $systemd_bind -D "${INSTALLDIR}" -M "${DIST}" ${1+"$@"}
else else