summaryrefslogtreecommitdiff
path: root/sys-boot/grub
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2013-06-12 23:25:17 +0200
committerBertrand Jacquin <beber@meleeweb.net>2013-06-12 23:25:17 +0200
commit64ad8f9baa1fb962600bcaeed60bb0aa7370b42f (patch)
treebb706d48a84f26202aec7559940f181087bd0d38 /sys-boot/grub
parentsys-boot/grub: remove debug formilux patchs (diff)
downloadportage-64ad8f9baa1fb962600bcaeed60bb0aa7370b42f.tar.xz
sys-boot/grub: remove savemap formilux patch, I can reside on only default saved on mbr
Package-Manager: portage-2.1.12.4
Diffstat (limited to 'sys-boot/grub')
-rw-r--r--sys-boot/grub/ChangeLog10
-rw-r--r--sys-boot/grub/Manifest8
-rw-r--r--sys-boot/grub/files/formilux/0004_all_add-support-for-the-savemap-keyword.patch117
-rw-r--r--sys-boot/grub/files/formilux/0005_all_update-default_entry-according-to-the-savemap.patch40
-rw-r--r--sys-boot/grub/files/formilux/0006_all_add-support-for-savedefault-savemap.patch27
-rw-r--r--sys-boot/grub/files/formilux/0007_all_update-the-savemap-upon-user-action-or-fallback.patch77
-rw-r--r--sys-boot/grub/files/formilux/0008_all_documentation-savemap.patch292
-rw-r--r--sys-boot/grub/files/formilux/0009_all_sample-config-files-using-savemap.patch102
8 files changed, 11 insertions, 662 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index cf21c0c9..b67f6334 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -3,6 +3,16 @@
# $Header: $
12 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+ -files/formilux/0004_all_add-support-for-the-savemap-keyword.patch,
+ -files/formilux/0005_all_update-default_entry-according-to-the-savemap.patch,
+ -files/formilux/0006_all_add-support-for-savedefault-savemap.patch, -files/for
+ milux/0007_all_update-the-savemap-upon-user-action-or-fallback.patch,
+ -files/formilux/0008_all_documentation-savemap.patch,
+ -files/formilux/0009_all_sample-config-files-using-savemap.patch:
+ sys-boot/grub: remove savemap formilux patch, I can reside on only default
+ saved on mbr
+
+ 12 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
-files/formilux/0010_all_print-a-dot-for-each-disk-I-O-in-debug-mode.patch, -f
iles/formilux/0011_all_add-a-debug-message-booting-image-now-just-before.patch
:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e6dc7ca3..b52021ea 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,16 +1,10 @@
AUX formilux/0002_all_save-default-entry-on-mbr.patch 2915 SHA256 7177b8f2c75886cf5f97cf623ab4b86bb7818effc4472f2f8f208b4269663d7a WHIRLPOOL 3a038809cae93b412bf712b2f76070b35d58ffb48e09c8d3729a6466e8dca03a7c08afdbf2c72520aa3551cfd48af27ac8bb0ad0cbf88e35bdb11717cfb23a6c
AUX formilux/0003_all_add-grub-mbr-default3.patch 6097 SHA256 3bc1c5488bd8e9b9038374b62bf88d0c4eedd2a32a2e8bf63c8a52039a4f8164 WHIRLPOOL b49e110f6b418f1660cbf430ad9517ffcac88aa468c4da2cce2d757c4cafd743f69a5b64a146ea479fa633f6a6f5de1de774cbb792feead705b8423eb37280b1
-AUX formilux/0004_all_add-support-for-the-savemap-keyword.patch 2751 SHA256 9bed3175a97b1b35d4e4c08901d3b3c73ddb3b255736dd3165da1e9c0defc885 WHIRLPOOL 13cd9c09ae9daa4610231a358eb3756e7ecc582a419ae9990052a055513fd7c67398e9ae2cbc072d70f6e364b1288c1cbc87003ed1fe7d8967d9ed5cc864f81a
-AUX formilux/0005_all_update-default_entry-according-to-the-savemap.patch 1122 SHA256 e4b5ba5a63e0f2de7fdedd11497211f655b3cda491c6041f019b9d19577ee987 WHIRLPOOL 8330c85c2dd26a16ea56d727bcaf5d4ab70bf8a007842db4c61229514e3b197ffc711ca801fa3a33b096775d3cc0323c851ae671b626cc7b0b47364bf992dd4c
-AUX formilux/0006_all_add-support-for-savedefault-savemap.patch 948 SHA256 0935390c75a40cd6c61032cbebd7914b19665dd23c65ad018ad94fe3a6a79606 WHIRLPOOL 53f8e90f4eeb7bbb0f1332b19ab65344a282702f6b2760f4620bc9863d79ea4255a7b0f73072e8287e8678a613e3d23acfc7129589cf91755fda46af266dfce6
-AUX formilux/0007_all_update-the-savemap-upon-user-action-or-fallback.patch 2445 SHA256 2d1bc81b7afced1d151e2e1fe328397547ad1f97c865b7c02283ca31b8d40de5 WHIRLPOOL a6794f70590d3ae42ae3aa03aec1154b9435f9333c11454fc3c6b97009f90ad6b894425428e25ebc20a9c5762c88a2632061f5bef0703c8e1a0f609e3097fae8
-AUX formilux/0008_all_documentation-savemap.patch 10770 SHA256 da81461e3128fed1c53415bc12c493866f773bbf2305f73f13db5bc6156ee739 WHIRLPOOL 9f3fc6d9e35b61b492a929d4afd09784bcda5ffd29da4400e3b86d2abd506a27edcb985a29b6591267157bb44b5d984696391b199d802bd6a1698bcbe49d987a
-AUX formilux/0009_all_sample-config-files-using-savemap.patch 2750 SHA256 226287798b8669d069638d2df6918a028e5c7462794ae0febba70813e2efac9f WHIRLPOOL 0d4eb2ad32a1e09a376419425e5a5a2007f5397fdd0eecec5f1cea22ee1feb559b698e6d41105958aea7c7d74cf4856060d84e4d9b8e5bd2306b6a9097805c28
AUX grub.conf.gentoo 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
AUX grub.default 1254 SHA256 97f10c0421641b03cdb1f63496a1b10fbdeeb4b97e74c6804929f908729fb440 WHIRLPOOL 9aa39029fdbe1b2f1498785ae84f76c571e4ae2e80cecfcdcc7dd2c9bd11cfa88f4ab4b69c00994e028a1f921edecd37613c3b5e1523e979f8f38f09608992f3
DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
EBUILD grub-0.97-r13.ebuild 9437 SHA256 2355a22199627ce512b8d2365cedaa9599c7d7c8051babcc6a1e32a2d42bf1c0 WHIRLPOOL 2224867d5b5b8c9334be78995c7aa6b7b5b75b7a0a444669e49c31008b85100397aa9e4b054f72ca84c379b7510cbd934db73cf4c4edd14c816f67ffe663bb3e
-MISC ChangeLog 3019 SHA256 fed2f71427ed4076d55bec02441545cabcc53100009790b8dc897af459dd8877 WHIRLPOOL 56333d6ce119fd08d01e5af58fdaabea7637faf57481b82d6bbeb88af18f4be72ba64937acc8e425487119c078359b168cf8c5a4362ad59de3722f7f054d92cc
+MISC ChangeLog 3592 SHA256 cbf90b7ea8a4acc6ace5e4ed92fb45b9460d6cafa0bf0780069e34d9b1a29e3d WHIRLPOOL a1e2fc591f70f74f6274551f7111e6b70f9a553ced35f5b9e2101c704dd9f482e3cff8b6423f7ac51a3bdf007ab68296d490bb74eed565372d6820d81e08af1e
MISC metadata.xml 392 SHA256 ae5988356aa772177dad1e9ae04512450cc818285637adb86614d40d0dfb46bc WHIRLPOOL 9859d85d66b8dae1204950d9ab6a42004f7aaca8deb5616febb221ecc3b3479f8cfe8a6c475a6ea1aaf1fc3987eb6a24a7130879ebfe2c3208083fb1bd7ffdf0
diff --git a/sys-boot/grub/files/formilux/0004_all_add-support-for-the-savemap-keyword.patch b/sys-boot/grub/files/formilux/0004_all_add-support-for-the-savemap-keyword.patch
deleted file mode 100644
index f33787f9..00000000
--- a/sys-boot/grub/files/formilux/0004_all_add-support-for-the-savemap-keyword.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git a/stage2/builtins.c b/stage2/builtins.c
-index cb7e648..765deaa 100644
---- a/stage2/builtins.c
-+++ b/stage2/builtins.c
-@@ -61,6 +61,8 @@ int default_entry = 0;
- /* The fallback entry. */
- int fallback_entryno;
- int fallback_entries[MAX_FALLBACK_ENTRIES];
-+/* the save map. Ends with saved == -1 */
-+struct savemap savemap[MAX_SAVEMAP];
- /* The number of current entry. */
- int current_entryno;
- /* The address for Multiboot command-line buffer. */
-@@ -100,6 +102,7 @@ init_config (void)
- password = 0;
- fallback_entryno = -1;
- fallback_entries[0] = -1;
-+ savemap[0].saved = -1;
- grub_timeout = -1;
- }
-
-@@ -1364,6 +1367,59 @@ static struct builtin builtin_fallback =
- };
-
-
-+/* savemap */
-+static int
-+savemap_func (char *arg, int flags)
-+{
-+ int i = 0;
-+ int saved, backup, real;
-+
-+ while (*arg)
-+ {
-+ if (! safe_parse_maxint (&arg, &saved))
-+ return 1;
-+ if (*arg++ != ':')
-+ return 1;
-+ if (! safe_parse_maxint (&arg, &real))
-+ return 1;
-+ if (*arg++ != ':')
-+ return 1;
-+ if (! safe_parse_maxint (&arg, &backup))
-+ return 1;
-+
-+ savemap[i].saved = saved;
-+ savemap[i].real = real;
-+ savemap[i].backup = backup;
-+
-+ i++;
-+
-+ if (i == MAX_SAVEMAP)
-+ break;
-+
-+ arg = skip_to (0, arg);
-+ }
-+
-+ if (i < MAX_SAVEMAP)
-+ savemap[i].saved = -1;
-+
-+ return 0;
-+}
-+
-+static struct builtin builtin_savemap =
-+{
-+ "savemap",
-+ savemap_func,
-+ BUILTIN_MENU,
-+#if 0
-+ "savemap SAVED:REAL:NEXT...",
-+ "Define a boot sequence trying several images. Boot attemps on"
-+ " id SAVED will be mapped to id REAL, and will be retried upon"
-+ " next boot on id NEXT in case of failure."
-+ " To be used with savedefault savemap."
-+#endif
-+};
-+
-+
- /* find */
- /* Search for the filename ARG in all of partitions. */
- static int
-@@ -5069,6 +5125,7 @@ struct builtin *builtin_table[] =
- &builtin_root,
- &builtin_rootnoverify,
- &builtin_savedefault,
-+ &builtin_savemap,
- #ifdef SUPPORT_SERIAL
- &builtin_serial,
- #endif /* SUPPORT_SERIAL */
-diff --git a/stage2/shared.h b/stage2/shared.h
-index 7532980..b7b5fc6 100644
---- a/stage2/shared.h
-+++ b/stage2/shared.h
-@@ -595,6 +595,7 @@ extern void assign_device_name (int drive, const char *device);
-
- #ifndef STAGE1_5
- /* GUI interface variables. */
-+# define MAX_SAVEMAP 16
- # define MAX_FALLBACK_ENTRIES 8
- extern int fallback_entries[MAX_FALLBACK_ENTRIES];
- extern int fallback_entryno;
-@@ -845,6 +846,15 @@ struct builtin
- /* All the builtins are registered in this. */
- extern struct builtin *builtin_table[];
-
-+struct savemap {
-+ int saved;
-+ int real;
-+ int backup;
-+};
-+
-+extern struct savemap savemap[MAX_SAVEMAP];
-+extern int backup_entry;
-+
- /* The constants for kernel types. */
- typedef enum
- {
diff --git a/sys-boot/grub/files/formilux/0005_all_update-default_entry-according-to-the-savemap.patch b/sys-boot/grub/files/formilux/0005_all_update-default_entry-according-to-the-savemap.patch
deleted file mode 100644
index 9d08fa3a..00000000
--- a/sys-boot/grub/files/formilux/0005_all_update-default_entry-according-to-the-savemap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/stage2/builtins.c b/stage2/builtins.c
-index 765deaa..a5e4d62 100644
---- a/stage2/builtins.c
-+++ b/stage2/builtins.c
-@@ -63,6 +63,8 @@ int fallback_entryno;
- int fallback_entries[MAX_FALLBACK_ENTRIES];
- /* the save map. Ends with saved == -1 */
- struct savemap savemap[MAX_SAVEMAP];
-+/* the entry which will be used by 'savedefault savemap' */
-+int backup_entry;
- /* The number of current entry. */
- int current_entryno;
- /* The address for Multiboot command-line buffer. */
-@@ -99,6 +101,7 @@ void
- init_config (void)
- {
- default_entry = 0;
-+ backup_entry = 0;
- password = 0;
- fallback_entryno = -1;
- fallback_entries[0] = -1;
-@@ -806,7 +809,18 @@ default_func (char *arg, int flags)
- #ifndef SUPPORT_DISKLESS
- if (grub_strcmp (arg, "saved") == 0)
- {
-+ int i;
-+
- default_entry = saved_entryno;
-+ for (i = 0; i < MAX_SAVEMAP && savemap[i].saved != -1; i++)
-+ {
-+ if (savemap[i].saved == default_entry)
-+ {
-+ default_entry = savemap[i].real;
-+ backup_entry = savemap[i].backup;
-+ break;
-+ }
-+ }
- return 0;
- }
- #endif /* SUPPORT_DISKLESS */
diff --git a/sys-boot/grub/files/formilux/0006_all_add-support-for-savedefault-savemap.patch b/sys-boot/grub/files/formilux/0006_all_add-support-for-savedefault-savemap.patch
deleted file mode 100644
index bb610bd5..00000000
--- a/sys-boot/grub/files/formilux/0006_all_add-support-for-savedefault-savemap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/stage2/builtins.c b/stage2/builtins.c
-index a5e4d62..9b0cf5e 100644
---- a/stage2/builtins.c
-+++ b/stage2/builtins.c
-@@ -3549,6 +3549,8 @@ savedefault_func (char *arg, int flags)
-
- entryno = fallback_entries[index];
- }
-+ else if (grub_memcmp (arg, "savemap", sizeof ("savemap") - 1) == 0)
-+ entryno = backup_entry;
- else if (! safe_parse_maxint (&arg, &entryno))
- return 1;
- }
-@@ -3637,10 +3639,11 @@ static struct builtin builtin_savedefault =
- "savedefault",
- savedefault_func,
- BUILTIN_CMDLINE,
-- "savedefault [NUM | `fallback']",
-+ "savedefault [NUM | `fallback' | 'savemap']",
- "Save the current entry as the default boot entry if no argument is"
- " specified. If a number is specified, this number is saved. If"
-- " `fallback' is used, next fallback entry is saved."
-+ " `fallback' is used, next fallback entry is saved. If 'savemap'"
-+ " is used, next boot will follow the save map."
- };
-
-
diff --git a/sys-boot/grub/files/formilux/0007_all_update-the-savemap-upon-user-action-or-fallback.patch b/sys-boot/grub/files/formilux/0007_all_update-the-savemap-upon-user-action-or-fallback.patch
deleted file mode 100644
index 307b7b56..00000000
--- a/sys-boot/grub/files/formilux/0007_all_update-the-savemap-upon-user-action-or-fallback.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/stage2/stage2.c b/stage2/stage2.c
-index 2851d72..be0ae4a 100644
---- a/stage2/stage2.c
-+++ b/stage2/stage2.c
-@@ -482,8 +482,26 @@ restart:
-
- if (config_entries)
- {
-+ /* If the user presses Enter, he explicitly wants to set the
-+ * current boot image to this one, which includes resetting
-+ * the next default boot. In this case, we look for the first
-+ * entry in the savemap for which the mapped entry matches the
-+ * selected one.
-+ */
- if ((c == '\n') || (c == '\r') || (c == 6))
-- break;
-+ {
-+ int i;
-+ for (i = 0; i < MAX_SAVEMAP && savemap[i].saved != -1; i++)
-+ {
-+ if (savemap[i].real == first_entry + entryno)
-+ {
-+ default_entry = first_entry + entryno;
-+ backup_entry = savemap[i].backup;
-+ break;
-+ }
-+ }
-+ break;
-+ }
- }
- else
- {
-@@ -742,7 +760,24 @@ restart:
- /* Set CURRENT_ENTRYNO for the command "savedefault". */
- if (config_entries)
- current_entryno = first_entry + entryno;
--
-+
-+ /* check if we are booting something different from the default image.
-+ * This may be caused by user action, of fallback because of an image
-+ * not found. In both cases, we must update the backup image.
-+ */
-+ if (current_entryno != default_entry)
-+ {
-+ int i;
-+ for (i = 0; i < MAX_SAVEMAP && savemap[i].saved != -1; i++)
-+ {
-+ if (savemap[i].real == current_entryno)
-+ {
-+ default_entry = current_entryno;
-+ backup_entry = savemap[i].backup;
-+ break;
-+ }
-+ }
-+ }
- if (run_script (cur_entry, heap))
- {
- if (fallback_entryno >= 0)
-@@ -1064,6 +1099,18 @@ cmain (void)
- }
- else
- default_entry = 0;
-+
-+ for (i = 0; i < MAX_SAVEMAP && savemap[i].saved != -1; i++)
-+ {
-+ if (savemap[i].real == default_entry)
-+ {
-+ default_entry = savemap[i].real;
-+ backup_entry = savemap[i].backup;
-+ break;
-+ }
-+ }
-+ if (backup_entry >= num_entries)
-+ backup_entry = default_entry;
- }
-
- if (is_preset)
diff --git a/sys-boot/grub/files/formilux/0008_all_documentation-savemap.patch b/sys-boot/grub/files/formilux/0008_all_documentation-savemap.patch
deleted file mode 100644
index f421efd5..00000000
--- a/sys-boot/grub/files/formilux/0008_all_documentation-savemap.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-diff --git a/docs/boot-states.fig b/docs/boot-states.fig
-new file mode 100644
-index 0000000..6e85e5b
---- /dev/null
-+++ b/docs/boot-states.fig
-@@ -0,0 +1,286 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Metric
-+A4
-+100.00
-+Single
-+-2
-+1200 2
-+0 32 #d7d7d7
-+6 2250 1125 3150 1350
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 2700 1237 450 112 2250 1125 3150 1350
-+4 1 0 45 -1 18 8 0.0000 4 120 420 2700 1305 0: img1\001
-+-6
-+6 2250 1575 3150 1800
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 2700 1687 450 112 2250 1575 3150 1800
-+4 1 0 45 -1 18 8 0.0000 4 120 420 2700 1755 1: img1\001
-+-6
-+6 4050 1125 4950 1350
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 4500 1237 450 112 4050 1125 4950 1350
-+4 1 0 45 -1 18 8 0.0000 4 120 420 4500 1305 2: img2\001
-+-6
-+6 4050 1575 4950 1800
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 4500 1687 450 112 4050 1575 4950 1800
-+4 1 0 45 -1 18 8 0.0000 4 120 420 4500 1755 3: img2\001
-+-6
-+6 4050 2025 4950 2250
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 4500 2137 450 112 4050 2025 4950 2250
-+4 1 0 45 -1 18 8 0.0000 4 120 420 4500 2205 4: img1\001
-+-6
-+6 4050 3150 4950 3375
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 4500 3262 450 112 4050 3150 4950 3375
-+4 1 0 45 -1 18 8 0.0000 4 120 570 4500 3330 244: img2\001
-+-6
-+6 4050 3600 4950 3825
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 4500 3712 450 112 4050 3600 4950 3825
-+4 1 0 45 -1 18 8 0.0000 4 120 570 4500 3780 245: img2\001
-+-6
-+6 4050 4050 4950 4275
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 4500 4162 450 112 4050 4050 4950 4275
-+4 1 0 45 -1 18 8 0.0000 4 120 570 4500 4230 246: img1\001
-+-6
-+6 4050 4500 4950 4725
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 4500 4612 450 112 4050 4500 4950 4725
-+4 1 0 45 -1 18 8 0.0000 4 120 570 4500 4680 247: img1\001
-+-6
-+6 2250 4500 3150 4725
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 2700 4612 450 112 2250 4500 3150 4725
-+4 1 0 45 -1 18 8 0.0000 4 120 570 2700 4680 243: img2\001
-+-6
-+6 2250 4050 3150 4275
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 2700 4162 450 112 2250 4050 3150 4275
-+4 1 0 45 -1 18 8 0.0000 4 120 570 2700 4230 242: img2\001
-+-6
-+6 2250 3600 3150 3825
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 2700 3712 450 112 2250 3600 3150 3825
-+4 1 0 45 -1 18 8 0.0000 4 120 570 2700 3780 241: img1\001
-+-6
-+6 2250 3150 3150 3375
-+1 2 0 1 0 7 50 -1 20 0.000 1 0.0000 2700 3262 450 112 2250 3150 3150 3375
-+4 1 0 45 -1 18 8 0.0000 4 120 570 2700 3330 240: img1\001
-+-6
-+2 2 0 1 0 7 50 -1 20 0.000 0 0 -1 0 0 5
-+ 450 5175 900 5175 900 5265 450 5265 450 5175
-+2 1 0 1 26 7 49 -1 -1 0.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 450 5220 900 5220
-+2 2 0 1 0 7 50 -1 20 0.000 0 0 -1 0 0 5
-+ 450 5355 900 5355 900 5445 450 5445 450 5355
-+2 1 0 1 14 7 49 -1 -1 0.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 450 5400 900 5400
-+2 2 0 1 0 7 50 -1 20 0.000 0 0 -1 0 0 5
-+ 450 5535 900 5535 900 5625 450 5625 450 5535
-+2 1 0 1 5 7 49 -1 -1 0.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 450 5580 900 5580
-+2 2 0 1 0 7 50 -1 20 0.000 0 0 -1 0 0 5
-+ 450 5715 900 5715 900 5805 450 5805 450 5715
-+2 1 0 1 0 7 49 -1 -1 0.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 450 5760 900 5760
-+2 2 0 1 0 7 50 -1 20 0.000 0 0 -1 0 0 5
-+ 2250 5175 2700 5175 2700 5265 2250 5265 2250 5175
-+2 1 0 1 31 7 49 -1 -1 0.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 2250 5220 2700 5220
-+2 2 0 1 0 7 50 -1 20 0.000 0 0 -1 0 0 5
-+ 2250 5355 2700 5355 2700 5445 2250 5445 2250 5355
-+2 1 0 1 1 7 49 -1 -1 0.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 2250 5400 2700 5400
-+2 2 0 1 0 7 50 -1 20 0.000 0 0 -1 0 0 5
-+ 2250 5535 2700 5535 2700 5625 2250 5625 2250 5535
-+2 1 0 1 4 7 49 -1 -1 0.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 2250 5580 2700 5580
-+2 1 0 1 11 7 50 -1 -1 4.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 5580 2430 5580 2205
-+2 1 3 1 11 7 50 -1 -1 4.000 0 0 -1 0 0 2
-+ 855 2475 6525 2475
-+2 1 0 1 11 7 50 -1 -1 4.000 0 0 -1 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 5580 2520 5580 2745
-+2 2 0 1 0 32 50 -1 20 0.000 0 0 -1 0 0 5
-+ 4050 5175 7020 5175 7020 5670 4050 5670 4050 5175
-+3 0 0 1 5 7 46 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 4410 1125 4365 945 4140 900 3330 900 3015 1125
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 5 7 46 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 3150 1215 3420 1170 3375 990 3105 1170
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 5 7 46 -1 -1 0.000 0 1 0 3
-+ 1 1 1.00 60.00 120.00
-+ 3150 1665 3285 1485 3105 1305
-+ 0.000 1.000 0.000
-+3 0 0 1 5 7 46 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4905 2115 5355 1575 5175 1350 4905 1305
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 5 7 46 -1 -1 0.000 0 1 0 3
-+ 1 1 1.00 60.00 120.00
-+ 4905 1620 5085 1485 4815 1305
-+ 0.000 1.000 0.000
-+3 0 0 1 14 7 47 -1 -1 0.000 0 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 2700 1350 2700 1575
-+ 0.000 0.000
-+3 0 0 1 14 7 47 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 2745 1800 2925 1935 3510 1890 3735 1215 4050 1215
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 14 7 47 -1 -1 0.000 0 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 4500 1350 4500 1575
-+ 0.000 0.000
-+3 0 0 1 14 7 47 -1 -1 0.000 0 1 0 2
-+ 1 1 1.00 60.00 120.00
-+ 4500 1800 4500 2025
-+ 0.000 0.000
-+3 0 0 1 0 7 45 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 1440 1710 1575 1710 1755 1620 1980 1665 2250 1665
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 0 7 45 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 1440 1260 1575 1260 1755 1170 1980 1215 2250 1215
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 0 7 45 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 5850 1215 5625 1215 5445 1170 5265 1215 4950 1215
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 0 7 45 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 5850 1699 5625 1699 5445 1654 5265 1699 4950 1699
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 26 7 45 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 1665 810 2565 810 2745 990 2745 1125
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 26 7 45 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 1665 585 3600 585 4545 810 4545 1125
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 43 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 2475 1800 2250 2025 2025 3150 2025 3600 2295 4095
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 1 7 43 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4275 1350 3825 1575 3600 3105 4095 3690
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 4 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 3161 3237 3431 3192 3386 3012 3116 3192
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 4 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 3105 4140 3555 3600 3375 3375 3105 3330
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 4 7 44 -1 -1 0.000 0 1 0 3
-+ 1 1 1.00 60.00 120.00
-+ 3105 3645 3285 3510 3015 3330
-+ 0.000 1.000 0.000
-+3 0 0 1 4 7 44 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 3150 4590 3285 4590 3555 3735 3825 3240 4050 3240
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 4 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4950 3237 5220 3192 5175 3012 4905 3192
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 4 7 44 -1 -1 0.000 0 1 0 3
-+ 1 1 1.00 60.00 120.00
-+ 4905 3645 5085 3510 4815 3330
-+ 0.000 1.000 0.000
-+3 0 0 1 4 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4905 4095 5220 3600 5175 3375 4905 3330
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4140 4230 4095 4275 4095 4455 4140 4545
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4140 3780 4095 3825 4095 4005 4140 4095
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4140 3330 4095 3375 4095 3555 4140 3645
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 5
-+ 1 1 1.00 60.00 120.00
-+ 2700 4725 2925 4950 3510 4545 3780 4095 4050 4140
-+ 0.000 1.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 6
-+ 1 1 1.00 60.00 120.00
-+ 4320 4725 4095 4950 2250 4950 2025 4725 2025 4275 2250 4185
-+ 0.000 1.000 1.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 2385 4230 2340 4275 2340 4455 2385 4545
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 2385 3780 2340 3825 2340 4005 2385 4095
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 44 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 2430 3330 2340 3375 2340 3555 2385 3645
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 31 7 45 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 1665 2835 2565 2835 2745 3015 2745 3150
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 31 7 45 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 1665 2610 3600 2610 4275 2835 4500 3150
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 43 -1 -1 0.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4690 1800 5355 2295 5355 3825 4950 4185
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 50 -1 -1 4.000 0 1 0 4
-+ 1 1 1.00 60.00 120.00
-+ 4365 2250 4230 2745 3510 3600 3150 3735
-+ 0.000 1.000 1.000 0.000
-+3 0 0 1 1 7 50 -1 -1 4.000 0 1 0 7
-+ 1 1 1.00 60.00 120.00
-+ 3150 1260 3330 1350 3465 1575 3555 2295 3600 2970 3510 3420
-+ 3150 3690
-+ 0.000 1.000 1.000 1.000 1.000 1.000 0.000
-+3 0 0 1 4 7 50 -1 -1 4.000 0 1 0 9
-+ 1 1 1.00 60.00 120.00
-+ 4455 4725 4365 4860 4005 4995 2970 5040 2070 4950 1935 4725
-+ 1755 4050 1800 3465 2250 3285
-+ 0.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000
-+ 0.000
-+4 2 0 45 -1 18 6 0.0000 4 105 1050 1350 1755 update-boot-image:1\001
-+4 2 0 45 -1 18 6 0.0000 4 105 1020 1350 1260 switch-boot-image:1\001
-+4 0 0 45 -1 18 6 0.0000 4 105 1020 5895 1260 switch-boot-image:2\001
-+4 0 0 45 -1 18 6 0.0000 4 105 1050 5895 1755 update-boot-image:2\001
-+4 2 0 45 -1 18 6 0.0000 4 120 1500 1575 855 Select img1 from Menu (v0.7)\001
-+4 2 0 45 -1 18 6 0.0000 4 120 1500 1575 630 Select img2 from Menu (v0.7)\001
-+4 2 0 45 -1 18 6 0.0000 4 120 1500 1575 2655 Select img2 from Menu (v1.0)\001
-+4 2 0 45 -1 18 6 0.0000 4 120 1500 1575 2880 Select img1 from Menu (v1.0)\001
-+4 0 0 45 -1 18 6 0.0000 4 120 900 990 5265 menu entry (v0.7)\001
-+4 0 0 45 -1 18 6 0.0000 4 120 930 990 5445 savedefault (v0.7)\001
-+4 0 0 45 -1 18 6 0.0000 4 120 1005 990 5625 validate-boot (v0.7)\001
-+4 0 0 45 -1 18 6 0.0000 4 105 1035 990 5805 unchanged programs\001
-+4 0 0 45 -1 18 6 0.0000 4 120 900 2790 5265 menu entry (v1.0)\001
-+4 0 0 45 -1 18 6 0.0000 4 120 930 2790 5445 savedefault (v1.0)\001
-+4 0 0 45 -1 18 6 0.0000 4 120 1005 2790 5625 validate-boot (v1.0)\001
-+4 0 0 45 -1 18 6 0.0000 4 90 840 5670 2385 version 0.7 & 1.0\001
-+4 0 0 45 -1 18 6 0.0000 4 105 795 5670 2610 version 1.0 only\001
-+4 0 5 45 -1 18 6 0.0000 4 90 675 5220 2025 validate-boot\001
-+4 1 14 45 -1 18 6 0.0000 4 90 600 3015 2070 savedefault\001
-+4 2 1 45 -1 18 6 0.0000 4 90 600 3960 4770 savedefault\001
-+4 0 4 45 -1 18 6 0.0000 4 90 675 4365 4995 validate-boot\001
-+4 2 0 45 -1 12 6 0.0000 4 75 2820 6930 5310 savemap 240:0:241 244:1:245 241:0:242 242:1:243\001
-+4 2 0 45 -1 12 6 0.0000 4 60 2340 6930 5445 243:1:246 245:1:246 246:0:247 247:0:242\001
-+4 2 0 45 -1 12 6 0.0000 4 60 2340 6930 5580 0:0:241 1:0:242 2:1:245 3:1:246 4:0:241\001
diff --git a/sys-boot/grub/files/formilux/0009_all_sample-config-files-using-savemap.patch b/sys-boot/grub/files/formilux/0009_all_sample-config-files-using-savemap.patch
deleted file mode 100644
index fbe44726..00000000
--- a/sys-boot/grub/files/formilux/0009_all_sample-config-files-using-savemap.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/docs/menu-hda.lst b/docs/menu-hda.lst
-new file mode 100644
-index 0000000..b34ce07
---- /dev/null
-+++ b/docs/menu-hda.lst
-@@ -0,0 +1,45 @@
-+#
-+# boot last working image by default, and allow one failure
-+#
-+
-+hiddenmenu
-+
-+serial --unit=0 --speed=9600
-+terminal --timeout=3 console serial
-+
-+# Here comes the mapping between saved entries and usable entries. All
-+# unexpected entries should be mapped to any image in order not to loop.
-+# Old entries 0..3 are remapped too.
-+savemap 240:0:241 244:1:245 241:0:242 242:1:243 243:1:246 245:1:246 246:0:247 247:0:242 0:0:241 1:0:242 2:1:245 3:1:246 4:0:241
-+
-+default saved
-+timeout 3
-+fallback 0 1 2
-+
-+# image 0
-+title Image 1
-+ root (hd0,1)
-+ savedefault savemap
-+ kernel /sys/active/kernel.img root=/dev/ram0 ro auto quiet console=ttyS0,9600 panic=1 hdb=noprobe ide1=noprobe flash=hda2 img=0
-+ initrd /sys/active/initrd.img
-+
-+# image 1
-+title Image 2
-+ root (hd0,1)
-+ savedefault savemap
-+ kernel /sys/backup/kernel.img root=/dev/ram0 ro auto quiet console=ttyS0,9600 panic=1 hdb=noprobe ide1=noprobe flash=hda2 img=1
-+ initrd /sys/backup/initrd.img
-+
-+# image 2
-+title Maintenance Kernel
-+ root (hd0,0)
-+ kernel /boot/firmware/firmware.img quiet console=ttyS0,9600 panic=1 hdb=noprobe ide1=noprobe flash=hda2 img=2
-+
-+# image 3
-+title Reboot
-+ reboot
-+
-+# image 4
-+title Halt
-+ halt
-+
-diff --git a/docs/menu-hdc.lst b/docs/menu-hdc.lst
-new file mode 100644
-index 0000000..2da4e7f
---- /dev/null
-+++ b/docs/menu-hdc.lst
-@@ -0,0 +1,45 @@
-+#
-+# boot last working image by default, and allow one failure
-+#
-+
-+hiddenmenu
-+
-+serial --unit=0 --speed=9600
-+terminal --timeout=3 console serial
-+
-+# Here comes the mapping between saved entries and usable entries. All
-+# unexpected entries should be mapped to any image in order not to loop.
-+# Old entries 0..3 are remapped too.
-+savemap 240:0:241 244:1:245 241:0:242 242:1:243 243:1:246 245:1:246 246:0:247 247:0:242 0:0:241 1:0:242 2:1:245 3:1:246 4:0:241
-+
-+default saved
-+timeout 3
-+fallback 0 1 2
-+
-+# image 0
-+title Image 1
-+ root (hd0,1)
-+ savedefault savemap
-+ kernel /sys/active/kernel.img root=/dev/ram0 ro auto quiet console=ttyS0,9600 panic=1 ide0=noprobe hdd=noprobe flash=hdc2 img=0
-+ initrd /sys/active/initrd.img
-+
-+# image 1
-+title Image 2
-+ root (hd0,1)
-+ savedefault savemap
-+ kernel /sys/backup/kernel.img root=/dev/ram0 ro auto quiet console=ttyS0,9600 panic=1 ide0=noprobe hdd=noprobe flash=hdc2 img=1
-+ initrd /sys/backup/initrd.img
-+
-+# image 2
-+title Maintenance Kernel
-+ root (hd0,0)
-+ kernel /boot/firmware/firmware.img quiet console=ttyS0,9600 panic=1 ide0=noprobe hdd=noprobe flash=hdc2 img=2
-+
-+# image 3
-+title Reboot
-+ reboot
-+
-+# image 4
-+title Halt
-+ halt
-+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:12:21 +0000