Procházet zdrojové kódy

minor fixes for nfsroot bootup

Waldemar Brodkorb před 10 roky
rodič
revize
ae7e5021b8
2 změnil soubory, kde provedl 5 přidání a 3 odebrání
  1. 3 3
      package/base-files/src/etc/mdev/fs
  2. 2 0
      target/Makefile

+ 3 - 3
package/base-files/src/etc/mdev/fs

@@ -1,7 +1,7 @@
 #!/bin/sh
 # skip root disk here, will be handled in /etc/init.d/fs
 rootdisk=$(readlink /dev/root)
-if [ ${rootdisk} = ${MDEV} ];then
+if [ "x${rootdisk}" = "x${MDEV}" ];then
 	exit 0
 fi
 uuid=$(blkid /dev/${MDEV} | sed -n '/^.*UUID="\([^"]*\)".*$/s//\1/p')
@@ -15,7 +15,7 @@ else
 	disk="${MDEV} (${uuid})"
 fi
 if [ -z $fs ];then
-	logger -s "Disk $disk not registered in /etc/fstab"
+	logger "Disk $disk not registered in /etc/fstab"
 	exit 0
 fi
 
@@ -49,7 +49,7 @@ adk_mount() {
 
 case "${ACTION}" in
 add)
-	logger -s "Device ${MDEV} added to the system"
+	logger "Device ${MDEV} added to the system"
 	adk_fsck
 	adk_mount
 	;;

+ 2 - 0
target/Makefile

@@ -53,8 +53,10 @@ config-prepare: $(TOPDIR)/.config
 	    while IFS='=' read symbol value; do \
 		sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \
 	done;)
+ifeq ($(ADK_TARGET_ROOTFS_NFSROOT),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ro"#' \
 		${BUILD_DIR}/.kernelconfig.board
+endif
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${FS_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 ifneq ($(ADK_TARGET_CMDLINE),)