eclass-overlay: activate ntp user which is used by chrony
BUG=b/176257054
TEST=presubmit
RELEASE_NOTE=None
Change-Id: I4df75eb5878e4f3e42d8bc548d627cfb2d6a5c0f
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/eclass-overlay/+/19850
Reviewed-by: Anil Altinay <aaltinay@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/acct-group/ntp/ntp-0.0.1.ebuild b/acct-group/ntp/ntp-0.0.1.ebuild
new file mode 100644
index 0000000..800b4ac
--- /dev/null
+++ b/acct-group/ntp/ntp-0.0.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+KEYWORDS="*"
+
+inherit user
+
+# TODO(crbug.com/1026816): this ebuild is just a placeholder (to satisfy Gentoo
+# dependencies) while we wait to implement acct-{group,user} properly.
+pkg_setup() {
+ enewgroup ntp
+}
diff --git a/acct-user/chrony/chrony-0.0.1.ebuild b/acct-user/chrony/chrony-0.0.1.ebuild
deleted file mode 100644
index ee3457b..0000000
--- a/acct-user/chrony/chrony-0.0.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SLOT="0"
-KEYWORDS="*"
-
-inherit user
-
-# TODO(crbug/1026816): this is a placeholder (to satisfy Gentoo
-# openssh dependencies) while acct-{group,user} are implemented.
-pkg_setup() {
- enewuser chrony
-}
diff --git a/acct-group/chrony/chrony-0.0.1.ebuild b/acct-user/ntp/ntp-0.0.1.ebuild
similarity index 94%
rename from acct-group/chrony/chrony-0.0.1.ebuild
rename to acct-user/ntp/ntp-0.0.1.ebuild
index bd2139c..4a7f98d 100644
--- a/acct-group/chrony/chrony-0.0.1.ebuild
+++ b/acct-user/ntp/ntp-0.0.1.ebuild
@@ -11,5 +11,5 @@
# TODO(crbug/1026816): this is a placeholder (to satisfy Gentoo
# openssh dependencies) while acct-{group,user} are implemented.
pkg_setup() {
- enewgroup chrony
+ enewuser ntp
}
diff --git a/profiles/base/accounts/group/chrony b/profiles/base/accounts/group/chrony
deleted file mode 100644
index b43058c..0000000
--- a/profiles/base/accounts/group/chrony
+++ /dev/null
@@ -1,3 +0,0 @@
-group:chrony
-gid:300
-users:
diff --git a/profiles/base/accounts/group/ntp b/profiles/base/accounts/group/ntp
index 823c659..5a4019c 100644
--- a/profiles/base/accounts/group/ntp
+++ b/profiles/base/accounts/group/ntp
@@ -1,4 +1,3 @@
group:ntp
gid:203
users:
-defunct:true
diff --git a/profiles/base/accounts/user/chrony b/profiles/base/accounts/user/chrony
deleted file mode 100644
index 8099175..0000000
--- a/profiles/base/accounts/user/chrony
+++ /dev/null
@@ -1,6 +0,0 @@
-user:chrony
-uid:300
-gid:300
-gecos:chrony daemon
-home:/dev/null
-shell:/bin/false
diff --git a/profiles/base/accounts/user/ntp b/profiles/base/accounts/user/ntp
index 7fa6453..bf8f627 100644
--- a/profiles/base/accounts/user/ntp
+++ b/profiles/base/accounts/user/ntp
@@ -4,4 +4,3 @@
gecos:network time protocol daemon
home:/dev/null
shell:/bin/false
-defunct:true
