util-linux: Add mount lock patch

Add the mount lock patch that moves the lock file from the potentially R/O
/etc, to the R/W /var/lock directory.

This resolves a problem when mounting when / (and /etc) is mounted R/O.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
This commit is contained in:
Mark Hatle 2011-02-03 21:36:21 -06:00 committed by Richard Purdie
parent fdb6a23ea0
commit d372eadfd3
2 changed files with 28 additions and 2 deletions

View File

@ -0,0 +1,25 @@
The FHS indicates that /etc must be capable of being mounted R/O.
The FHS also indicates that lock files belong in /var/lock, and /var must
be R/W as soon as possible during boot.
This patch moves the mtab lock file from the potentially R/O /etc, to the
R/W /var/lock area. This lock file is used when mounting disks and making
other mount adjustments. The _PATH_MOUNTED_TMP is not adjusted, as failing
to write to this file does not cause any functional limitations.
(Note, if /etc is R/O, then /etc/mtab should be a symlink to /proc/mounts)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
--- util-linux-ng-2.16/include/pathnames.h.orig
+++ util-linux-ng-2.16/include/pathnames.h
@@ -90,7 +90,7 @@
# endif
#endif
-#define _PATH_MOUNTED_LOCK _PATH_MOUNTED "~"
+#define _PATH_MOUNTED_LOCK "/var/lock/mtab~"
#define _PATH_MOUNTED_TMP _PATH_MOUNTED ".tmp"
#ifndef _PATH_DEV

View File

@ -1,9 +1,10 @@
MAJOR_VERSION = "2.17"
require util-linux.inc
PR = "r4"
PR = "r5"
SRC_URI += "file://uclibc-compile.patch \
file://util-linux-ng-replace-siginterrupt.patch"
file://util-linux-ng-replace-siginterrupt.patch \
file://util-linux-ng-2.16-mount_lock_path.patch"
SRC_URI[md5sum] = "4635725a3eef1c57090bac8ea5e082e6"
SRC_URI[sha256sum] = "c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f"