Skip to content

Commit

Permalink
Fix creation and cleanup of edgeagentuser and edgehubuser (#6594)
Browse files Browse the repository at this point in the history
- Delete edgeagentuser and edgehubuser during package purge
- Allow creation of edgeagentuser and edgehub user to fail during package install. edgeHub and edgeAgent will still work if their users don't exist on the host. The host will misidentify files owned by edgeHub and edgeAgent, but the modules will still work.
  • Loading branch information
gordonwang0 authored Aug 16, 2022
1 parent 388ec1a commit 89801b4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions edgelet/contrib/centos/aziot-edge.spec
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ fi

# Create an edgeagentuser and add it to iotedge group
if ! /usr/bin/getent passwd %{iotedge_agent_user} >/dev/null; then
%{_sbindir}/useradd -r -g %{iotedge_group} -c "edgeAgent user" -s /bin/sh -u %{iotedge_agent_uid} %{iotedge_agent_user}
%{_sbindir}/useradd -r -g %{iotedge_group} -c "edgeAgent user" -s /bin/sh -u %{iotedge_agent_uid} %{iotedge_agent_user} || true
fi

# Create an edgehubuser
if ! getent passwd edgehubuser >/dev/null; then
%{_sbindir}/useradd -r -c "edgeHub user" -s /bin/sh -u %{iotedge_hub_uid} %{iotedge_hub_user}
%{_sbindir}/useradd -r -c "edgeHub user" -s /bin/sh -u %{iotedge_hub_uid} %{iotedge_hub_user} || true
fi

# Add iotedge user to aziot-identity-service groups
Expand Down
4 changes: 4 additions & 0 deletions edgelet/contrib/debian/postrm
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ case "$1" in
gpasswd -d "$u" iotedge
done

# Remove iotedge users.
/usr/sbin/userdel iotedge
rm -rf /var/lib/aziot/edged

/usr/sbin/userdel edgeagentuser
/usr/sbin/userdel edgehubuser

if [ -d /var/lib/aziot ] && [ -z "$(ls -A /var/lib/aziot)" ]; then
rm -rf /var/lib/aziot
fi
Expand Down
4 changes: 2 additions & 2 deletions edgelet/contrib/debian/preinst
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ add_groups()

# Create an edgeagentuser and add it to iotedge group
if ! getent passwd edgeagentuser >/dev/null; then
useradd -r -g iotedge -c "edgeAgent user" -s /bin/sh -u 13622 edgeagentuser
useradd -r -g iotedge -c "edgeAgent user" -s /bin/sh -u 13622 edgeagentuser || true
fi

# Create an edgehubuser
if ! getent passwd edgehubuser >/dev/null; then
useradd -r -c "edgeHub user" -s /bin/sh -u 13623 edgehubuser
useradd -r -c "edgeHub user" -s /bin/sh -u 13623 edgehubuser || true
fi

# add iotedge user to docker group so that it can talk to the docker socket
Expand Down
4 changes: 2 additions & 2 deletions edgelet/contrib/enterprise-linux/aziot-edge.spec
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ fi

# Create an edgeagentuser and add it to iotedge group
if ! /usr/bin/getent passwd %{iotedge_agent_user} >/dev/null; then
%{_sbindir}/useradd -r -g %{iotedge_group} -c "edgeAgent user" -s /bin/sh -u %{iotedge_agent_uid} %{iotedge_agent_user}
%{_sbindir}/useradd -r -g %{iotedge_group} -c "edgeAgent user" -s /bin/sh -u %{iotedge_agent_uid} %{iotedge_agent_user} || true
fi

# Create an edgehubuser
if ! getent passwd edgehubuser >/dev/null; then
%{_sbindir}/useradd -r -c "edgeHub user" -s /bin/sh -u %{iotedge_hub_uid} %{iotedge_hub_user}
%{_sbindir}/useradd -r -c "edgeHub user" -s /bin/sh -u %{iotedge_hub_uid} %{iotedge_hub_user} || true
fi

# Add iotedge user to aziot-identity-service groups
Expand Down

0 comments on commit 89801b4

Please sign in to comment.