summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShao Miller <shao.miller@yrdsb.edu.on.ca>2010-07-19 23:34:04 -0400
committerShao Miller <shao.miller@yrdsb.edu.on.ca>2010-07-19 23:34:04 -0400
commita8ed766f8c4eea40906086228f10785745342694 (patch)
treea8c3fa577d7a36351df389c2585d2c2c9a1c6ff0
parentc02184c7378991951ffe07add1ff368a8663c18b (diff)
downloadsyslinux-a8ed766f8c4eea40906086228f10785745342694.tar.gz
extlinux, linux: Ignore --force in these installerssyslinux-4.02-pre4
Previous commits described this behaviour, but did not actually implement it. :) Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
-rwxr-xr-xextlinux/main.c2
-rwxr-xr-xlinux/syslinux.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/extlinux/main.c b/extlinux/main.c
index a541e38a..002cecd9 100755
--- 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 || opt.install_mbr || opt.activate_partition || opt.force)
+ if (!opt.directory || opt.install_mbr || opt.activate_partition)
usage(EX_USAGE, 0);
if (opt.update_only == -1) {
diff --git a/linux/syslinux.c b/linux/syslinux.c
index 9807bdf0..97b6a306 100755
--- a/linux/syslinux.c
+++ b/linux/syslinux.c
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
subdir = "/";
}
- if (!opt.device || opt.install_mbr || opt.activate_partition || opt.force)
+ if (!opt.device || opt.install_mbr || opt.activate_partition)
usage(EX_USAGE, MODE_SYSLINUX);
/*