summaryrefslogtreecommitdiff
path: root/sysutils/syslinux/files/patch-libinstaller-syslxopt.c
diff options
context:
space:
mode:
authorMarcelo Araujo <araujo@FreeBSD.org>2013-01-21 03:39:17 +0000
committerMarcelo Araujo <araujo@FreeBSD.org>2013-01-21 03:39:17 +0000
commitf6b014d4f1a7a386126d3ed6f9c1a01cdd65d5a7 (patch)
treeaf72ec7cc5268655355da37cddfac54f69c959a0 /sysutils/syslinux/files/patch-libinstaller-syslxopt.c
parent- Update MASTER_SITES. (diff)
- Update to 5.00.
- Update MASTER_SITES. - Add MAKE_JOBS_SAFE. - Trim header. PR: ports/174180 Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Notes
Notes: svn path=/head/; revision=310745
Diffstat (limited to 'sysutils/syslinux/files/patch-libinstaller-syslxopt.c')
-rw-r--r--sysutils/syslinux/files/patch-libinstaller-syslxopt.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/syslinux/files/patch-libinstaller-syslxopt.c b/sysutils/syslinux/files/patch-libinstaller-syslxopt.c
index c23156d4fc68..c551ff9b4aa6 100644
--- a/sysutils/syslinux/files/patch-libinstaller-syslxopt.c
+++ b/sysutils/syslinux/files/patch-libinstaller-syslxopt.c
@@ -1,6 +1,6 @@
--- libinstaller/syslxopt.c.orig 2010-10-20 21:25:38.000000000 +0200
+++ libinstaller/syslxopt.c 2010-11-16 15:09:16.897550744 +0100
-@@ -44,6 +44,8 @@
+@@ -45,6 +45,8 @@
.activate_partition = 0,
.force = 0,
.bootsecfile = NULL,
@@ -9,7 +9,7 @@
};
const struct option long_options[] = {
-@@ -57,7 +59,7 @@
+@@ -58,7 +60,7 @@
{"stupid", 0, NULL, 's'},
{"heads", 1, NULL, 'H'},
{"raid-mode", 0, NULL, 'r'},
@@ -18,10 +18,10 @@
{"help", 0, NULL, 'h'},
{"once", 1, NULL, OPT_ONCE},
{"clear-once", 0, NULL, 'O'},
-@@ -65,10 +67,12 @@
- {"menu-save", 1, NULL, 'M'},
+@@ -67,10 +69,12 @@
{"mbr", 0, NULL, 'm'}, /* DOS/Win32 only */
{"active", 0, NULL, 'a'}, /* DOS/Win32 only */
+ {"device", 1, NULL, OPT_DEVICE},
+ {"verbose", 0, NULL, 'v' },
+ {"bimage", 1, NULL, 'b' },
{0, 0, 0, 0}
@@ -32,7 +32,7 @@
void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode)
{
-@@ -109,7 +113,9 @@
+@@ -112,7 +116,9 @@
" --raid -r Fall back to the next device on boot failure\n"
" --once=... %s Execute a command once upon boot\n"
" --clear-once -O Clear the boot-once command\n"
@@ -43,9 +43,9 @@
mode == MODE_SYSLINUX ? " " : "-o");
/*
* Have to chop this roughly in half for the DOS installer due
-@@ -209,11 +215,17 @@
- case 'a':
- opt.activate_partition = 1;
+@@ -217,11 +223,17 @@
+ usage(EX_USAGE, mode);
+ opt.device = optarg;
break;
- case 'v':
+ case 'V':