aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2003-01-30 02:02:56 +0000
committerhpa <hpa>2003-01-30 02:02:56 +0000
commitea49eb042a599a875fa4508027ef5eb60079cc64 (patch)
treea546deb5ac4e1174e2c33cd91680ab770343cd0b
parent2094b0420547123905bc458562c626f0504d7323 (diff)
downloadsyslinux-ea49eb042a599a875fa4508027ef5eb60079cc64.tar.gz
syslinux-ea49eb042a599a875fa4508027ef5eb60079cc64.tar.xz
syslinux-ea49eb042a599a875fa4508027ef5eb60079cc64.zip
Support "owner" in /etc/fstab
-rw-r--r--NEWS1
-rw-r--r--syslinux.c5
-rw-r--r--syslinux.doc2
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index d5f9d061..30c4c3db 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 3aafc15a..4519e032 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 94a9d498..ae5903b8 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