diff options
| author |   Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2012-01-12 16:35:22 +0000 |
|---|---|---|
| committer | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2012-01-12 16:35:22 +0000 |
| commit | 1faf663a00a42283025e5d461ab6099c222f0bb9 (patch) | |
| tree | f1f763d5d327cd7dbf1a340f617b1a4f922594b9 /sys-kernel/dracut/files | |
| parent | Fix invalid use of autotools-utils.eclass. (diff) | |
| download | gentoo-2-1faf663a00a42283025e5d461ab6099c222f0bb9.tar.gz gentoo-2-1faf663a00a42283025e5d461ab6099c222f0bb9.tar.bz2 gentoo-2-1faf663a00a42283025e5d461ab6099c222f0bb9.zip | |
sys-kernel/dracut-014: Fixed bug #396575 and revbumped to r1.
Fixed fsck usage error on /usr mount wrt bug #396575.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/dracut/files')
| -rw-r--r-- | sys-kernel/dracut/files/dracut-014-usrmount-fsck-fix.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/sys-kernel/dracut/files/dracut-014-usrmount-fsck-fix.patch b/sys-kernel/dracut/files/dracut-014-usrmount-fsck-fix.patch new file mode 100644 index 000000000000..2ed52835a705 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-014-usrmount-fsck-fix.patch @@ -0,0 +1,45 @@ +From 5926a2cb526f11d4a4a3cd3980e5894f8e96e615 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> +Date: Thu, 12 Jan 2012 10:23:38 +0100 +Subject: [PATCH] 98usrmount: don't pass fstab fs options as fsck options + +For example for line in /etc/fstab: + + /dev/vg/usr /usr ext4 nosuid,nodev 0 2 + +fsck_single is called as follows: + + fsck_single /dev/vg/usr ext4 nosuid,nodev + +and this eventually resolves to: + + e2fsck -a nosuid,nodev /dev/vg/usr + +which causes e2fsck usage error. +--- + modules.d/98usrmount/mount-usr.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh +index a61f935..fc205d5 100755 +--- a/modules.d/98usrmount/mount-usr.sh ++++ b/modules.d/98usrmount/mount-usr.sh +@@ -19,7 +19,7 @@ mount_usr() + + if [ "x$_usr_found" != "x" ]; then + # we have to mount /usr +- fsck_single "$_dev" "$_fs" "$_opts" ++ fsck_single "$_dev" "$_fs" + _ret=$? + echo $_ret >/run/initramfs/usr-fsck + if [ $_ret -ne 255 ]; then +@@ -29,4 +29,4 @@ mount_usr() + fi + } + +-mount_usr +\ No newline at end of file ++mount_usr +-- +1.7.8.3 + |