From b0ac906b283b428ba1c7f35fe1e71a84b3d3d9c6 Mon Sep 17 00:00:00 2001 From: Paulo Alcantara Date: Tue, 5 Jul 2011 21:32:51 +0000 Subject: Add NTFS filesystem support to Linux and Windows installers Signed-off-by: Paulo Alcantara --- libinstaller/syslxopt.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libinstaller/syslxopt.c') diff --git a/libinstaller/syslxopt.c b/libinstaller/syslxopt.c index 7ceb3ba2..e081a00e 100644 --- a/libinstaller/syslxopt.c +++ b/libinstaller/syslxopt.c @@ -25,6 +25,7 @@ #include #include "../version.h" #include "syslxcom.h" +#include "syslxfs.h" #include "syslxopt.h" /* These are the options we can set their values */ -- cgit v1.2.1 From 3f51f9e151e1a0829ae6321320baa3b6e7c61877 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 20 Jun 2012 16:08:53 -0700 Subject: extlinux: add --device option to override device detect Add a --device option for scripts and expert users to override the device detection. Signed-off-by: H. Peter Anvin --- libinstaller/syslxopt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libinstaller/syslxopt.c') diff --git a/libinstaller/syslxopt.c b/libinstaller/syslxopt.c index e081a00e..dde4969f 100644 --- a/libinstaller/syslxopt.c +++ b/libinstaller/syslxopt.c @@ -66,6 +66,7 @@ const struct option long_options[] = { {"menu-save", 1, NULL, 'M'}, {"mbr", 0, NULL, 'm'}, /* DOS/Win32 only */ {"active", 0, NULL, 'a'}, /* DOS/Win32 only */ + {"device", 1, NULL, OPT_DEVICE}, {0, 0, 0, 0} }; @@ -87,7 +88,8 @@ void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode) /* Mounted fs installation (extlinux) */ /* Actually extlinux can also use -d to provide a directory too... */ fprintf(stderr, - "Usage: %s [options] directory\n", + "Usage: %s [options] directory\n" + " --device Force use of a specific block device (experts only)\n" program); break; @@ -210,6 +212,11 @@ void parse_options(int argc, char *argv[], enum syslinux_mode mode) case 'a': opt.activate_partition = 1; break; + case OPT_DEVICE: + if (mode != EXTLINUX_MODE) + usage(EX_USAGE, mode); + opt.device = optarg; + break; case 'v': fprintf(stderr, "%s " VERSION_STR " Copyright 1994-" YEAR_STR -- cgit v1.2.1 From 876bf608bb2a0e4da78dbeb2b0ae40ef88e254c1 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 20 Jun 2012 16:12:29 -0700 Subject: syslxopt: fix syntax errors Oops :) Signed-off-by: H. Peter Anvin --- libinstaller/syslxopt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libinstaller/syslxopt.c') diff --git a/libinstaller/syslxopt.c b/libinstaller/syslxopt.c index dde4969f..b739752f 100644 --- a/libinstaller/syslxopt.c +++ b/libinstaller/syslxopt.c @@ -89,7 +89,7 @@ void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode) /* Actually extlinux can also use -d to provide a directory too... */ fprintf(stderr, "Usage: %s [options] directory\n" - " --device Force use of a specific block device (experts only)\n" + " --device Force use of a specific block device (experts only)\n", program); break; @@ -213,7 +213,7 @@ void parse_options(int argc, char *argv[], enum syslinux_mode mode) opt.activate_partition = 1; break; case OPT_DEVICE: - if (mode != EXTLINUX_MODE) + if (mode != MODE_EXTLINUX) usage(EX_USAGE, mode); opt.device = optarg; break; -- cgit v1.2.1