diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /package/base-files | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/src/etc/init.d/boot | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a298d108b..f320d6b82 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 67 +PKG_RELEASE:= 68 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index b859d1d89..8daf52b89 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -5,7 +5,9 @@ . /etc/functions.sh # disable kernel messages -echo 0 > /proc/sys/kernel/printk +if [ -f /proc/sys/kernel/printk ];then + echo 0 > /proc/sys/kernel/printk +fi # remount /dev with smaller size mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev |