From 0f9a597cdac08dc7cfbfb4b11fb358c9df41dd3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 21 Dec 2015 14:53:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20grub=20(=D0=BC=D0=BD=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D1=87=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=B5=D0=BD=D1=8E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/3.3/2_ac_install_merge/sys-boot/grub/10_linux | 6 +++++- .../3.3/2_ac_install_merge/sys-boot/grub/30_os-prober | 5 +++++ .../1-merge/sys-boot/grub/livemenu/35_calculate | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/88 | 4 ++++ 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/30_os-prober create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/88 diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/10_linux b/profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/10_linux index 630070eb7..19f759bf1 100644 --- a/profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/10_linux +++ b/profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/10_linux @@ -1 +1,5 @@ -# Calculate format=patch autoupdate path=/etc/grub.d +# Calculate multiline format=patch autoupdate path=/etc/grub.d +(replacement_title=.*?Advanced options.*?)g'\)" +\1g') ..." +("submenu '.*?Advanced options for.*?grub_quote\))' +\1 ...' diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/30_os-prober b/profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/30_os-prober new file mode 100644 index 000000000..19f759bf1 --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/sys-boot/grub/30_os-prober @@ -0,0 +1,5 @@ +# Calculate multiline format=patch autoupdate path=/etc/grub.d +(replacement_title=.*?Advanced options.*?)g'\)" +\1g') ..." +("submenu '.*?Advanced options for.*?grub_quote\))' +\1 ...' diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate index 396e4d625..174a90510 100644 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate @@ -15,7 +15,7 @@ if [[ -d $livepath ]]; then $(prepare_grub_to_access_device $livedevice) if [ -f ${liverelpath}/grub.cfg ]; then - menuentry 'Live HDD' { + menuentry 'Live HDD ...' { $(prepare_grub_to_access_device $livedevice | grub_add_tab | grub_add_tab) configfile ${liverelpath}/grub.cfg } diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index 27f71d172..35b0cbf81 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 87 +remerge = 88 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/88 b/profiles/templates/3.3/6_ac_update_sync/remerge/88 new file mode 100644 index 000000000..1db72d260 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/88 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-boot/grub ini(overlay-calculate.remerge)<87 + +[overlay-calculate] +remerge = 87