summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/src/etc/init.d/fs2
-rw-r--r--package/busybox/Makefile12
-rw-r--r--package/busybox/files/busybox.postinst12
3 files changed, 6 insertions, 20 deletions
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index cb87e5aeb..581be2a35 100755
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -27,7 +27,7 @@ for fs in $fstypes; do
grep $fs /proc/filesystems >/dev/null 2>&1
if [ $? -eq 0 ];then
[ -x /usr/sbin/fsck.$fs ] && {
- logger -s -t 'Filesystem' "checking $fs filesystem on $disk"
+ logger -t 'Filesystem' "checking $fs filesystem on $disk"
fsck -p $disk >/dev/null
}
logger -t '' "Mounting local filesystems"
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index fe3d313a5..eabed3ef3 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -47,21 +47,9 @@ do-configure:
do-build:
PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} busybox
-BBDEFS:=(
-define BBDEF
-ifeq ($(ADK_RUNTIME_START_BUSYBOX_$(1)),y)
-BBDEFS+=echo BBDEF_$(1)=YES;
-else
-BBDEFS+=echo BBDEF_$(1)=NO;
-endif
-endef
-$(foreach OPTION,CROND WATCHDOG SYSLOGD INETD NTPD,$(eval $(call BBDEF,$(OPTION))))
-
do-install:
PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} install $(MAKE_TRACE)
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
- $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc
- ${BBDEFS} :) >$(IDIR_BUSYBOX)/etc/.bb_defaults
ifeq ($(BUSYBOX_IFUPDOWN),y)
$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d
$(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 89c2d7b74..75996525a 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -1,13 +1,11 @@
#!/bin/sh
-if [ -z $IPKG_INSTROOT ];then chmod u+s /bin/busybox;fi
. $IPKG_INSTROOT/etc/functions.sh
-. $IPKG_INSTROOT/etc/.bb_defaults
add_rcconf network YES
-add_rcconf crond ${BBDEF_CROND}
-add_rcconf watchdog ${BBDEF_WATCHDOG}
+add_rcconf crond NO
+add_rcconf watchdog NO
add_rcconf watchdog_flags '-t 10 -T 20'
-add_rcconf syslogd ${BBDEF_SYSLOGD}
+add_rcconf syslogd NO
add_rcconf syslogd_flags '-C32'
-add_rcconf inetd ${BBDEF_INETD}
-add_rcconf ntpd ${BBDEF_NTPD}
+add_rcconf inetd NO
+add_rcconf ntpd NO
add_rcconf ntpd_flags '-p time.fu-berlin.de'