diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-01-21 22:46:54 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-02-22 06:01:49 +0100 |
| commit | a9acf88c1dda80acd3de5d08f61a7e452fdc4510 (patch) | |
| tree | f52a2e9e67ed6054eb2ec8b6fb30169b69b9d7a3 /init | |
| parent | be9a42675f3ea125c9daa45986a3b58ba8bae226 (diff) | |
| download | mkinitcpio-a9acf88c1dda80acd3de5d08f61a7e452fdc4510.tar.gz mkinitcpio-a9acf88c1dda80acd3de5d08f61a7e452fdc4510.tar.xz | |
use --tab-file flag for findmnt -s
Behavior changed in util-linux commit 2f1ac44b4b.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -88,9 +88,10 @@ elif [ ! -x "/new_root${init}" ]; then fi # mount /usr if it exists -if [ -f /new_root/etc/fstab ]; then - if usr_source=$(findmnt -nero source -s/new_root/etc/fstab /usr); then - mountopts=$(findmnt -nero options -s/new_root/etc/fstab /usr) +realtab=/new_root/etc/fstab +if [ -f "$realtab" ]; then + if usr_source=$(findmnt -snero source --tab-file="$realtab" /usr); then + mountopts=$(findmnt -snero options --tab-file="$realtab" /usr) fsck_device "$usr_source" mount "$usr_source" /new_root/usr -o "$mountopts" fi |