diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-10 13:51:40 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-10 13:51:40 +0100 |
| commit | a15599b22985f9b688ec6407881fa74b32e7f522 (patch) | |
| tree | 324d2b8e34116dbfed28ed06a9f390596c854339 | |
| parent | 5f454209b33b45c1787a7ffc872d9a3290c54948 (diff) | |
| parent | a1f6fae37977577792379e6b8441538783f5b3ca (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/src/init | 2 | ||||
| -rw-r--r-- | target/Makefile | 4 | ||||
| -rw-r--r-- | target/alix1c/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.debug | 7 |
5 files changed, 15 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e3eb84fbf..c2a4e6a3f 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:= 28 +PKG_RELEASE:= 29 PKG_SECTION:= base PKG_DESCR:= basic files and scripts diff --git a/package/base-files/src/init b/package/base-files/src/init index 553cb5b3d..096209cdc 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -6,7 +6,7 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { size=$(cat /etc/tmpfs 2>/dev/null) [ -z $size ] && size=2048 - mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777,size=${size}k + mount tmpfs /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=${size}k } mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev mkdir /dev/pts /dev/shm diff --git a/target/Makefile b/target/Makefile index 83c8ff900..2c1f7b686 100644 --- a/target/Makefile +++ b/target/Makefile @@ -55,6 +55,10 @@ endif done;) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${FS_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board +ifeq ($(ADK_QUIET_KERNEL),y) + @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet"#' \ + ${BUILD_DIR}/.kernelconfig.board +endif ifeq ($(ADK_KERNEL_DEBUG_WITH_KGDB),y) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 kgdbwait kgdboc=ttyS0,115200"#' \ ${BUILD_DIR}/.kernelconfig.board diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index d38eb727b..bed5b3c69 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -15,10 +15,10 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "To install everything to CompactFlash use scripts/install.sh" endif ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSUSERTARBALL}' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 613609153..814b6d6a6 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -24,6 +24,13 @@ config ADK_KERNEL_FRAME_POINTER boolean default n +config ADK_QUIET_KERNEL + prompt "Make bootup quiet without messages from the kernel" + bool + default n + help + Make bootup quiet without messages from the kernel. + config ADK_KERNEL_MAGIC_SYSRQ prompt "Magic BREAK sequence" bool |