aboutsummaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-06-09 17:20:10 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-09 17:22:54 -0700
commit064b36baf1da53a709d1598209b025fcd4494d27 (patch)
treecdc99acd6d9fb97a3aa6dab969ae5c0640976880 /linux
parent8ae3122d64ef1434b2b11b25cacd77d65663b3fa (diff)
downloadsyslinux-064b36baf1da53a709d1598209b025fcd4494d27.tar.gz
syslinux-064b36baf1da53a709d1598209b025fcd4494d27.tar.xz
syslinux-064b36baf1da53a709d1598209b025fcd4494d27.zip
syslinux: don't break -o just yet; print warning and resume
-o has been supported for a very long time; recommend using -t instead, but for now proceed with an error message. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/syslinux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/syslinux.c b/linux/syslinux.c
index 1194fbb3..bd3c555c 100644
--- a/linux/syslinux.c
+++ b/linux/syslinux.c
@@ -286,12 +286,12 @@ int main(int argc, char *argv[])
mypid = getpid();
umask(077);
- parse_options(argc, argv, 1);
+ parse_options(argc, argv, MODE_SYSLINUX);
subdir = opt.directory;
if (!opt.device)
- usage(EX_USAGE, 1);
+ usage(EX_USAGE, MODE_SYSLINUX);
/*
* First make sure we can open the device at all, and that we have
@@ -400,7 +400,7 @@ int main(int argc, char *argv[])
rmdir(mntpath);
exit(0);
} else
- usage(EX_USAGE, 0);
+ usage(EX_USAGE, MODE_SYSLINUX);
}
/* Read a pre-existing ADV, if already installed */