diff --git a/srcpkgs/ntp/INSTALL b/srcpkgs/ntp/INSTALL index abeba724e39..ffa5f2280d6 100644 --- a/srcpkgs/ntp/INSTALL +++ b/srcpkgs/ntp/INSTALL @@ -1,26 +1,11 @@ # -# This script creates the ntpd system user/group. +# This script creates required dirs for chroot initialization. # case "${ACTION}" in pre) ;; post) - echo "Running ${PKGNAME}-${VERSION} post installation hooks..." - if ! getent group ntpd >/dev/null; then - groupadd -r ntpd 2>&1 >/dev/null - [ $? -ne 0 ] && exit $? - echo "Created ntpd system group." - fi - if ! getent passwd ntpd >/dev/null; then - useradd -c "Network Time Protocol Daemon" \ - -d /var/chroot/ntpd \ - -s /sbin/nologin -g ntpd -r ntpd && \ - passwd -l ntpd 2>&1 >/dev/null - [ $? -ne 0 ] && exit $? - echo "Created ntpd system user." - fi - # Fix ntpd initialization with -i (chrooted). if [ ! -d var/chroot/ntpd/var/db ]; then mkdir -p var/chroot/ntpd/var/db diff --git a/srcpkgs/ntp/REMOVE b/srcpkgs/ntp/REMOVE deleted file mode 100644 index 16c626c3b70..00000000000 --- a/srcpkgs/ntp/REMOVE +++ /dev/null @@ -1,13 +0,0 @@ -# -# This script removes the ntpd user/group. -# -case "${ACTION}" in -pre) - if [ "$UPDATE" = "no" ]; then - userdel ntpd 2>&1 >/dev/null - [ $? -eq 0 ] && echo "Removed ntpd system user/group." - fi - ;; -post) - ;; -esac diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index c54befe151e..99d3758c711 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.4p8 -revision=1 +revision=2 distfiles="http://archive.ntp.org/ntp4/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-linuxcaps --enable-getifaddrs=glibc @@ -19,6 +19,8 @@ long_desc=" subpackages="$pkgname-perl" conf_files="/etc/ntp.conf" openrc_services="ntpd default" +system_accounts="ntpd" +ntpd_homedir="/var/chroot/ntpd" Add_dependency run glibc Add_dependency run readline