aboutsummaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorShao Miller <shao.miller@yrdsb.edu.on.ca>2010-07-03 03:47:25 -0400
committerShao Miller <shao.miller@yrdsb.edu.on.ca>2010-07-03 05:28:00 -0400
commit591ab24b42b606caf4dabbb8bf33dbc421e8f005 (patch)
tree710bba25ca4b1f233c5c625208e4f4120c75a327 /linux
parentc8c991a6a094f4678e7f9b36faf1fb0534328fc1 (diff)
downloadsyslinux-591ab24b42b606caf4dabbb8bf33dbc421e8f005.tar.gz
syslinux-591ab24b42b606caf4dabbb8bf33dbc421e8f005.tar.xz
syslinux-591ab24b42b606caf4dabbb8bf33dbc421e8f005.zip
libinstaller: Add --mbr, --active, and --force options
In order to consolidate the installer option-parsing system, we add the --mbr (-m), --active (-a), and --force (-f) options from the DOS, Win32, and mtools installers to libinstaller. Since the -m and -a options are not currently valid for the Linux 'syslinux' and 'extlinux' installers, we add error messages to both of these. The -f option is allowed but does nothing for them. Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
Diffstat (limited to 'linux')
-rwxr-xr-x[-rw-r--r--]linux/syslinux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/syslinux.c b/linux/syslinux.c
index 9462138f..9807bdf0 100644..100755
--- a/linux/syslinux.c
+++ b/linux/syslinux.c
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
subdir = "/";
}
- if (!opt.device)
+ if (!opt.device || opt.install_mbr || opt.activate_partition || opt.force)
usage(EX_USAGE, MODE_SYSLINUX);
/*