qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 19:47:29 +02:00
Code

fixup openntpd package. ntpd now starts as user ntp and

Browse Source 
CONTROL/postinst can be executed on host and target system.
idea from nbd to use IPKG_ROOTDIR


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@435 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
wbx 2005-03-23 20:19:42 +00:00
parent b1b9d8388f
commit 7bf482253f
5 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openwrt/package/openntpd/Makefile
View File

@ -42,6 +42,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
--mandir=/usr/man \
--infodir=/usr/info \
--with-builtin-arc4random \
--with-privsep-user=ntp \
);
touch $(PKG_BUILD_DIR)/.configured
@ -49,11 +50,10 @@ $(PKG_BUILD_DIR)/ntpd: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR)
$(PKG_IPK): $(PKG_BUILD_DIR)/ntpd
mkdir -p $(PKG_IPK_DIR)/usr/sbin
cp -a ./ipkg/* $(PKG_IPK_DIR)/
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(PKG_IPK_DIR){/usr/sbin,/etc/init.d}
cp $(PKG_BUILD_DIR)/ntpd $(PKG_IPK_DIR)/usr/sbin/
cp ./files/ntpd.conf $(PKG_IPK_DIR)/etc/
cp ./files/S49ntpd $(PKG_IPK_DIR)/etc/init.d/
$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)

25
openwrt/package/openntpd/ipkg/CONTROL/postinst Executable file
View File

@ -0,0 +1,25 @@
#!/bin/sh
grep -q '^ntp[[:space:]]*123/udp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
[ $? -ne 0 ] && echo "ntp 123/udp" >>${IPKG_INSTROOT}/etc/services
NU=ntp
U=`grep "^$NU:" ${IPKG_INSTROOT}/etc/passwd 2>/dev/null | cut -d: -f3`
if [ .$U = . ]; then
U=`cut -d: -f3 ${IPKG_INSTROOT}/etc/passwd 2>/dev/null | sort -n | tail -1`
[ .$U = . ] && U=49
U=`expr $U + 1`
[ $U -lt 50 ] && U=50
G=`grep "^$NU:" ${IPKG_INSTROOT}/etc/group 2>/dev/null | cut -d: -f3`
if [ .$G = . ]; then
G=`cut -d: -f3 ${IPKG_INSTROOT}/etc/group 2>/dev/null | sort -n | tail -1`
[ .$G = . ] && G=49
G=`expr $G + 1`
[ $G -lt 50 ] && G=50
fi
LINE="$NU:x:$U:$G::/tmp/.ntp:/bin/false"
echo "$LINE" >>${IPKG_INSTROOT}/etc/passwd
else
awk -F: '{ if($1=="ntp") printf("%s:%s:%s:%s:%s:/tmp/.ntp:/bin/false\n",$1,$2,$3,$4,$5); else print $0 }' ${IPKG_INSTROOT}/etc/passwd >/tmp/$$
mv /tmp/$$ ${IPKG_INSTROOT}/etc/passwd
chmod 644 ${IPKG_INSTROOT}/etc/passwd
fi

3
openwrt/package/openntpd/ipkg/etc/init.d/S49ntpd Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
mkdir -p `grep "^ntp:" /etc/passwd | cut -d: -f6`
/usr/sbin/ntpd -s

0
openwrt/package/openntpd/files/ntpd.conf → openwrt/package/openntpd/ipkg/etc/ntpd.conf
View File

2
openwrt/rules.mk
View File

@ -112,7 +112,7 @@ endif
# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf
IPKG := IPKG_CONF_DIR=$(STAGING_DIR)/etc $(TARGET_DIR)/bin/ipkg -force-defaults -force-depends
IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(STAGING_DIR)/etc $(TARGET_DIR)/bin/ipkg -force-defaults -force-depends
IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
# invoke ipkg-build with some default options