search for: mtab_file

...+++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/extlinux/main.c b/extlinux/main.c index 55a1495..b7cdf92 100644 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -1044,12 +1044,12 @@ err: } #ifndef __KLIBC__ -static const char *find_device(const char *mtab_file, dev_t dev) +static char *find_device(const char *mtab_file, dev_t dev) { struct mntent *mnt; struct stat dst; FILE *mtab; - const char *devname = NULL; + char *devname = NULL; bool done; mtab = setmntent(mtab_file, "r"); @@ -1131,7 +1131,7 @@ static cons...

...+++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/extlinux/main.c b/extlinux/main.c index 55a1495..7bb7443 100644 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -1044,12 +1044,12 @@ err: } #ifndef __KLIBC__ -static const char *find_device(const char *mtab_file, dev_t dev) +static char *find_device(const char *mtab_file, dev_t dev) { struct mntent *mnt; struct stat dst; FILE *mtab; - const char *devname = NULL; + char *devname = NULL; bool done; mtab = setmntent(mtab_file, "r"); @@ -1131,7 +1131,7 @@ static cons...

...insertions(+), 14 deletions(-) > > diff --git a/extlinux/main.c b/extlinux/main.c > index 55a1495..b7cdf92 100644 > --- a/extlinux/main.c > +++ b/extlinux/main.c > @@ -1044,12 +1044,12 @@ err: > } > > #ifndef __KLIBC__ > -static const char *find_device(const char *mtab_file, dev_t dev) > +static char *find_device(const char *mtab_file, dev_t dev) > { > struct mntent *mnt; > struct stat dst; > FILE *mtab; > - const char *devname = NULL; > + char *devname = NULL; > bool done; > > mtab = setmntent(mtab_file,...

...mp;args.key; struct btrfs_ioctl_search_header *sh; int ret, i; - int fd; + int fd = -1; struct btrfs_root_ref *ref; struct btrfs_dir_item *dir_item; unsigned long off = 0; @@ -1044,12 +1044,12 @@ err: } #ifndef __KLIBC__ -static const char *find_device(const char *mtab_file, dev_t dev) +static char *find_device(const char *mtab_file, dev_t dev) { struct mntent *mnt; struct stat dst; FILE *mtab; - const char *devname = NULL; + char *devname = NULL; bool done; mtab = setmntent(mtab_file, "r"); @@ -1131,7 +1131,7 @@ static cons...

...t validate_device(const char *path, int devfd) > struct statfs sfs; > int pfd; > int rv = -1; > - > + > pfd = open(path, O_RDONLY|O_DIRECTORY); > if (pfd < 0) > goto err; > @@ -1063,6 +1083,17 @@ static const char *find_device(const char *mtab_file, dev_t dev) > done = true; > break; > } > + > + break; > + case UFS1: > + case UFS2: > + if (!strcmp(mnt->mnt_type, "ufs") && !stat(mnt->mnt_fsname, &dst) && > + dst.st_rdev == dev) { > + done = true; > + br...

..., devfd, rst); @@ -983,7 +1003,7 @@ static int validate_device(const char *path, int devfd) struct statfs sfs; int pfd; int rv = -1; - + pfd = open(path, O_RDONLY|O_DIRECTORY); if (pfd < 0) goto err; @@ -1063,6 +1083,17 @@ static const char *find_device(const char *mtab_file, dev_t dev) done = true; break; } + + break; + case UFS1: + case UFS2: + if (!strcmp(mnt->mnt_type, "ufs") && !stat(mnt->mnt_fsname, &dst) && + dst.st_rdev == dev) { + done = true; + break; + } + + break; case NONE: break;...

...= BTRFS_ROOT_BACKREF_KEY; + sk->min_offset = 0; + } else + break; + } + return subvol; +} + int install_file(const char *path, int devfd, struct stat *rst) { if (fs_type == EXT2 || fs_type == VFAT) @@ -546,19 +809,9 @@ static const char *find_device(const char *mtab_file, dev_t dev) if (!strcmp(mnt->mnt_type, "btrfs") && !stat(mnt->mnt_dir, &dst) && dst.st_dev == dev) { - char *opt = strstr(mnt->mnt_opts, BTRFS_SUBVOL_OPT); - - if (opt) { - if (!subvol[0]) { - char *tmp; - - strcpy(subv...

..., devfd, rst); @@ -983,7 +1008,7 @@ static int validate_device(const char *path, int devfd) struct statfs sfs; int pfd; int rv = -1; - + pfd = open(path, O_RDONLY|O_DIRECTORY); if (pfd < 0) goto err; @@ -1063,6 +1088,16 @@ static const char *find_device(const char *mtab_file, dev_t dev) done = true; break; } + + break; + case UFS1: + case UFS2: + if (!strcmp(mnt->mnt_type, "ufs") && !stat(mnt->mnt_fsname, &dst) && + dst.st_rdev == dev) { + done = true; + } + + break; case NONE: break; } @@ -118...

From: Raphael S. Carvalho <raphael.scarv at gmail.com> Wrote the documentation below. I think it would be good to push the doc to the wiki as soon as the UFS support gets merged. Unix Fast File System (UFS/FFS) 1/2 on Syslinux - (usage/install) ----- There is a confusion about the name of this file system, then I decided to contact the author who replied: "The name has always been

From: Raphael S. Carvalho <raphael.scarv at gmail.com> Change since v1: * Fix bug on dentry structure (thank you specification; btw, sarcasm), and consequently a bug on ufs_readdir. * Add readlink support (applied tests for symlinks whose destionation path were stored in blk pointers and the file itself). * Several improvements. Wrote the documentation below. I think it would be good to

...ext2_fat_install_file(path, devfd, rst); + else if (fs_type == BTRFS) + return btrfs_install_file(path, devfd, rst); + else if (fs_type == XFS) + return xfs_install_file(path, devfd, rst); + + return 1; } #ifdef __KLIBC__ @@ -847,14 +987,22 @@ static const char *find_device(const char *mtab_file, dev_t dev) } break; + case XFS: + if (!strcmp(mnt->mnt_type, "xfs") && !stat(mnt->mnt_fsname, &dst) && + dst.st_rdev == dev) { + done = true; + break; + } case NONE: break; } + if (done) { devname = strdup(mnt->mnt_f...