From ea49eb042a599a875fa4508027ef5eb60079cc64 Mon Sep 17 00:00:00 2001 From: hpa Date: Thu, 30 Jan 2003 02:02:56 +0000 Subject: [PATCH] Support "owner" in /etc/fstab --- NEWS | 1 + syslinux.c | 5 +++-- syslinux.doc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index d5f9d06..30c4c3d 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,7 @@ Changes in 2.01: * PXELINUX: Doc fix. * Build SYSLINUX into a small library for encapsulation into other programs. + * SYSLINUX: Make installer work with "owner" in /etc/fstab. Changes in 2.00: * ALL: Add support for "COM32" (32-bit COMBOOT) images. diff --git a/syslinux.c b/syslinux.c index 3aafc15..4519e03 100644 --- a/syslinux.c +++ b/syslinux.c @@ -336,14 +336,15 @@ int main(int argc, char *argv[]) !strcmp(mnt->mnt_type, "vfat") || !strcmp(mnt->mnt_type, "uvfat") || !strcmp(mnt->mnt_type, "auto") ) && - hasmntopt(mnt, "user") && + ( hasmntopt(mnt, "user") || + (hasmntopt(mnt, "owner") && st.st_uid == euid) ) && !hasmntopt(mnt, "ro") && mnt->mnt_dir[0] == '/' && !!hasmntopt(mnt, "loop") == !!S_ISREG(st.st_mode) && ( (!hasmntopt(mnt,"offset") && offset == 0) || (atol(hasmntopt(mnt, "offset")) == offset) ) ) { /* Okay, this is an fstab entry we should be able to live with. */ - + mntpath = mnt->mnt_dir; break; } diff --git a/syslinux.doc b/syslinux.doc index 94a9d49..ae5903b 100644 --- a/syslinux.doc +++ b/syslinux.doc @@ -2,7 +2,7 @@ A bootloader for Linux using MS-DOS floppies - Copyright (C) 1994-2002 H. Peter Anvin + Copyright (C) 1994-2003 H. Peter Anvin This program is provided under the terms of the GNU General Public License, version 2 or, at your option, any later version. There is no -- 2.7.4