diff options
| author | Marcelo Araujo <araujo@FreeBSD.org> | 2013-01-21 03:39:17 +0000 |
|---|---|---|
| committer | Marcelo Araujo <araujo@FreeBSD.org> | 2013-01-21 03:39:17 +0000 |
| commit | f6b014d4f1a7a386126d3ed6f9c1a01cdd65d5a7 (patch) | |
| tree | af72ec7cc5268655355da37cddfac54f69c959a0 /sysutils/syslinux/files | |
| parent | 570ec8db70abc754f86ab6f9ec267cf41d7649e6 (diff) | |
Notes
Diffstat (limited to 'sysutils/syslinux/files')
| -rw-r--r-- | sysutils/syslinux/files/patch-Makefile | 6 | ||||
| -rw-r--r-- | sysutils/syslinux/files/patch-libinstaller-syslxopt.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sysutils/syslinux/files/patch-Makefile b/sysutils/syslinux/files/patch-Makefile index 0493a6c1035d..283b42bd58b4 100644 --- a/sysutils/syslinux/files/patch-Makefile +++ b/sysutils/syslinux/files/patch-Makefile @@ -1,11 +1,11 @@ --- Makefile.orig 2011-04-18 23:24:17.000000000 +0200 +++ Makefile 2011-05-05 15:51:44.356358227 +0200 -@@ -52,18 +52,18 @@ +@@ -57,18 +57,18 @@ # Note: libinstaller is both a BSUBDIR and an ISUBDIR. It contains # files that depend only on the B phase, but may have to be regenerated # for "make installer". --BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ -+BSUBDIRS_ = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +-BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \ ++BSUBDIRS_ = codepage com32 lzo core memdisk mbr memdump gpxe sample \ diag libinstaller dos win32 win64 dosutil ITARGET = IOBJECTS = $(ITARGET) \ 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': |