diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-19 10:48:15 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-19 10:48:15 -0700 |
| commit | d083811efff31d3dec9ca95fb3380b72274e85ef (patch) | |
| tree | 536a8103d7029bc6fa855ef00e92a5273273a1c9 /extlinux/main.c | |
| parent | 9c2baed55c657e68b5d2aa7de7557eccfc74eb6b (diff) | |
| parent | e514447e3a4506468b1d066b3bd00f0d32df265a (diff) | |
| download | syslinux-4.02-pre3.tar.gz | |
Merge remote branch 'sha0/for_hpa'syslinux-4.02-pre3
Diffstat (limited to 'extlinux/main.c')
| -rw-r--r-- | extlinux/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extlinux/main.c b/extlinux/main.c index daebc101..a541e38a 100644 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -809,7 +809,7 @@ int main(int argc, char *argv[]) { parse_options(argc, argv, MODE_EXTLINUX); - if (!opt.directory) + if (!opt.directory || opt.install_mbr || opt.activate_partition || opt.force) usage(EX_USAGE, 0); if (opt.update_only == -1) { |