diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-01 09:03:19 +0200 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-01 09:03:19 +0200 |
commit | 9019d28c87b2c0382834a8af861cda4dc12e2b06 (patch) | |
tree | e3bf3da087056d9d8394ec808bc9a2ea989d9f65 /package/base-files | |
parent | 60e2481a45eba0e84e771453cda48075899e95e3 (diff) | |
parent | 1bad8cf3c967cac8fb149217878b56f9cec03c8b (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files')
-rw-r--r-- | package/base-files/Makefile | 3 | ||||
-rwxr-xr-x | package/base-files/src/etc/init.d/umount | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 605922737..8ff743270 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -65,6 +65,9 @@ endif ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab endif +ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y) + $(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab +endif $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ diff --git a/package/base-files/src/etc/init.d/umount b/package/base-files/src/etc/init.d/umount index bcd545999..49bd5a020 100755 --- a/package/base-files/src/etc/init.d/umount +++ b/package/base-files/src/etc/init.d/umount @@ -5,7 +5,7 @@ case $1 in autostop) cd / sync - for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }');do + for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }'|grep -v none);do umount $i 2>/dev/null done ;; |