Merge branch 'master' of git+ssh://openadk.org/git/openadk

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
 

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

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

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)

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