[syslinux:master] extlinux, linux: Ignore --force in these installers

syslinux-bot for Shao Miller shao.miller at yrdsb.edu.on.ca
Mon Jul 19 21:24:15 PDT 2010


Commit-ID:  a8ed766f8c4eea40906086228f10785745342694
Gitweb:     http://syslinux.zytor.com/commit/a8ed766f8c4eea40906086228f10785745342694
Author:     Shao Miller <shao.miller at yrdsb.edu.on.ca>
AuthorDate: Mon, 19 Jul 2010 23:34:04 -0400
Committer:  Shao Miller <shao.miller at yrdsb.edu.on.ca>
CommitDate: Mon, 19 Jul 2010 23:34:04 -0400

extlinux, linux: Ignore --force in these installers

Previous commits described this behaviour, but did not
actually implement it. :)

Signed-off-by: Shao Miller <shao.miller at yrdsb.edu.on.ca>


---
 extlinux/main.c  |    2 +-
 linux/syslinux.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extlinux/main.c b/extlinux/main.c
index a541e38..002cecd 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 9807bdf..97b6a30 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);
 
     /*



More information about the Syslinux-commits mailing list