| 1 |
commit: 694359d871720672bf70c51205352478982693e3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 13 16:16:03 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 26 10:26:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694359d8 |
| 7 |
|
| 8 |
user.eclass: Use more verbose logging |
| 9 |
|
| 10 |
Replace 'einfo' calls with either 'elog' or 'ewarn'. Practically all |
| 11 |
messages printed by the eclass functions are important, in particular |
| 12 |
regarding account changes and lack of permissions. |
| 13 |
|
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
eclass/user.eclass | 40 ++++++++++++++++++++-------------------- |
| 17 |
1 file changed, 20 insertions(+), 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/user.eclass b/eclass/user.eclass |
| 20 |
index 9bd0b607eab..a33915e2119 100644 |
| 21 |
--- a/eclass/user.eclass |
| 22 |
+++ b/eclass/user.eclass |
| 23 |
@@ -68,7 +68,7 @@ user_get_nologin() { |
| 24 |
# exist. |
| 25 |
enewuser() { |
| 26 |
if [[ ${EUID} != 0 ]] ; then |
| 27 |
- einfo "Insufficient privileges to execute ${FUNCNAME[0]}" |
| 28 |
+ ewarn "Insufficient privileges to execute ${FUNCNAME[0]}" |
| 29 |
return 0 |
| 30 |
fi |
| 31 |
_assert_pkg_ebuild_phase ${FUNCNAME} |
| 32 |
@@ -94,7 +94,7 @@ enewuser() { |
| 33 |
if [[ -n $(egetent passwd "${euser}") ]] ; then |
| 34 |
return 0 |
| 35 |
fi |
| 36 |
- einfo "Adding user '${euser}' to your system ..." |
| 37 |
+ elog "Adding user '${euser}' to your system ..." |
| 38 |
|
| 39 |
# options to pass to useradd |
| 40 |
local opts=() |
| 41 |
@@ -122,7 +122,7 @@ enewuser() { |
| 42 |
[[ ${euid} -ge 101 ]] || die "${FUNCNAME}: no free UID found" |
| 43 |
fi |
| 44 |
opts+=( -u ${euid} ) |
| 45 |
- einfo " - Userid: ${euid}" |
| 46 |
+ elog " - Userid: ${euid}" |
| 47 |
|
| 48 |
# handle shell |
| 49 |
local eshell=$1; shift |
| 50 |
@@ -138,7 +138,7 @@ enewuser() { |
| 51 |
else |
| 52 |
eshell=$(user_get_nologin) |
| 53 |
fi |
| 54 |
- einfo " - Shell: ${eshell}" |
| 55 |
+ elog " - Shell: ${eshell}" |
| 56 |
opts+=( -s "${eshell}" ) |
| 57 |
|
| 58 |
# handle homedir |
| 59 |
@@ -146,7 +146,7 @@ enewuser() { |
| 60 |
if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then |
| 61 |
ehome="/dev/null" |
| 62 |
fi |
| 63 |
- einfo " - Home: ${ehome}" |
| 64 |
+ elog " - Home: ${ehome}" |
| 65 |
opts+=( -d "${ehome}" ) |
| 66 |
|
| 67 |
# handle groups |
| 68 |
@@ -171,7 +171,7 @@ enewuser() { |
| 69 |
opts+=( -G "${exgroups:1}" ) |
| 70 |
fi |
| 71 |
fi |
| 72 |
- einfo " - Groups: ${egroups:-(none)}" |
| 73 |
+ elog " - Groups: ${egroups:-(none)}" |
| 74 |
|
| 75 |
# handle extra args |
| 76 |
if [[ $# -gt 0 ]] ; then |
| 77 |
@@ -179,7 +179,7 @@ enewuser() { |
| 78 |
else |
| 79 |
local comment="added by portage for ${PN}" |
| 80 |
opts+=( -c "${comment}" ) |
| 81 |
- einfo " - GECOS: ${comment}" |
| 82 |
+ elog " - GECOS: ${comment}" |
| 83 |
fi |
| 84 |
|
| 85 |
# add the user |
| 86 |
@@ -204,7 +204,7 @@ enewuser() { |
| 87 |
esac |
| 88 |
|
| 89 |
if [[ -n ${create_home} && ! -e ${ROOT}/${ehome} ]] ; then |
| 90 |
- einfo " - Creating ${ehome} in ${ROOT}" |
| 91 |
+ elog " - Creating ${ehome} in ${ROOT}" |
| 92 |
mkdir -p "${ROOT}/${ehome}" |
| 93 |
chown "${euser}" "${ROOT}/${ehome}" |
| 94 |
chmod 755 "${ROOT}/${ehome}" |
| 95 |
@@ -223,7 +223,7 @@ enewuser() { |
| 96 |
# can not be assigned. |
| 97 |
enewgroup() { |
| 98 |
if [[ ${EUID} != 0 ]] ; then |
| 99 |
- einfo "Insufficient privileges to execute ${FUNCNAME[0]}" |
| 100 |
+ ewarn "Insufficient privileges to execute ${FUNCNAME[0]}" |
| 101 |
return 0 |
| 102 |
fi |
| 103 |
_assert_pkg_ebuild_phase ${FUNCNAME} |
| 104 |
@@ -248,7 +248,7 @@ enewgroup() { |
| 105 |
if [[ -n $(egetent group "${egroup}") ]] ; then |
| 106 |
return 0 |
| 107 |
fi |
| 108 |
- einfo "Adding group '${egroup}' to your system ..." |
| 109 |
+ elog "Adding group '${egroup}' to your system ..." |
| 110 |
|
| 111 |
# handle gid |
| 112 |
local egid=$1; shift |
| 113 |
@@ -266,7 +266,7 @@ enewgroup() { |
| 114 |
[[ -n ${force_gid} ]] && die "${FUNCNAME}: -F with gid==-1 makes no sense" |
| 115 |
egid="next available" |
| 116 |
fi |
| 117 |
- einfo " - Groupid: ${egid}" |
| 118 |
+ elog " - Groupid: ${egid}" |
| 119 |
|
| 120 |
# handle extra |
| 121 |
if [[ $# -gt 0 ]] ; then |
| 122 |
@@ -351,12 +351,12 @@ esethome() { |
| 123 |
return 0 |
| 124 |
fi |
| 125 |
|
| 126 |
- einfo "Updating home for user '${euser}' ..." |
| 127 |
- einfo " - Home: ${ehome}" |
| 128 |
+ elog "Updating home for user '${euser}' ..." |
| 129 |
+ elog " - Home: ${ehome}" |
| 130 |
|
| 131 |
# ensure home directory exists, otherwise update will fail |
| 132 |
if [[ ! -e ${ROOT}/${ehome} ]] ; then |
| 133 |
- einfo " - Creating ${ehome} in ${ROOT}" |
| 134 |
+ elog " - Creating ${ehome} in ${ROOT}" |
| 135 |
mkdir -p "${ROOT}/${ehome}" |
| 136 |
chown "${euser}" "${ROOT}/${ehome}" |
| 137 |
chmod 755 "${ROOT}/${ehome}" |
| 138 |
@@ -420,8 +420,8 @@ esetshell() { |
| 139 |
return 0 |
| 140 |
fi |
| 141 |
|
| 142 |
- einfo "Updating shell for user '${euser}' ..." |
| 143 |
- einfo " - Shell: ${eshell}" |
| 144 |
+ elog "Updating shell for user '${euser}' ..." |
| 145 |
+ elog " - Shell: ${eshell}" |
| 146 |
|
| 147 |
# update the shell |
| 148 |
case ${CHOST} in |
| 149 |
@@ -476,8 +476,8 @@ esetcomment() { |
| 150 |
return 0 |
| 151 |
fi |
| 152 |
|
| 153 |
- einfo "Updating comment for user '${euser}' ..." |
| 154 |
- einfo " - Comment: ${ecomment}" |
| 155 |
+ elog "Updating comment for user '${euser}' ..." |
| 156 |
+ elog " - Comment: ${ecomment}" |
| 157 |
|
| 158 |
# update the comment |
| 159 |
case ${CHOST} in |
| 160 |
@@ -546,8 +546,8 @@ esetgroups() { |
| 161 |
fi |
| 162 |
|
| 163 |
local opts=( -g "${defgroup}" -G "${exgroups}" ) |
| 164 |
- einfo "Updating groups for user '${euser}' ..." |
| 165 |
- einfo " - Groups: ${egroups}" |
| 166 |
+ elog "Updating groups for user '${euser}' ..." |
| 167 |
+ elog " - Groups: ${egroups}" |
| 168 |
|
| 169 |
# update the group |
| 170 |
case ${CHOST} in |
Archives