From fda4ae35759513f2fa1c1d02a64974d4a77adfcf Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Mon, 25 Aug 2014 15:12:54 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20rescratch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../00-bootmenu/2.2.32.1/.calculate_directory | 1 + .../iso/00-bootmenu/2.2.32.1/desktop.config | 82 +++++++++++++++++++ .../iso/00-bootmenu/2.2.32.1/server.config | 56 +++++++++++++ .../builder/iso/00-bootmenu/desktop.config | 2 +- .../2.2/builder/iso/00-bootmenu/server.config | 2 +- .../2.2/builder/iso/grub/uefi_isohibryd | 1 + 6 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/.calculate_directory create mode 100644 profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/desktop.config create mode 100644 profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/server.config diff --git a/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/.calculate_directory b/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/.calculate_directory new file mode 100644 index 000000000..f2dba644d --- /dev/null +++ b/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip cl_ver>=2.2.32.1 diff --git a/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/desktop.config b/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/desktop.config new file mode 100644 index 000000000..abc7d8489 --- /dev/null +++ b/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/desktop.config @@ -0,0 +1,82 @@ +# Calculate name=system.config os_builder_linux_system==desktop&&cl_ver>=2.2.32.1 +HEADER +cld +#?os_builder_linux_subname!=# +#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-# +#os_builder_linux_subname# +#?os_builder_linux_subname==# +#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# +#os_builder_linux_subname# +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#?pkg(media-gfx/plymouth-themes-calculate)!=# +#-load(/bootmenu/bootparam.config)-# splash; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)!=&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:calculate; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)==&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# splash=off; +#pkg# + +cld-docache +#?os_builder_linux_subname!=# +#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-# (RAM) +#os_builder_linux_subname# +#?os_builder_linux_subname==# +#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM) +#os_builder_linux_subname# +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#?pkg(media-gfx/plymouth-themes-calculate)!=# +#-load(/bootmenu/bootparam.config)-# splash docache; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)!=&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:calculate docache; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)==&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# splash=off docache; +#pkg# + +cld-nox +#?os_builder_linux_subname!=# +#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-# (No-X) +#os_builder_linux_subname# +#?os_builder_linux_subname==# +#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-X) +#os_builder_linux_subname# +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#?pkg(media-gfx/plymouth-themes-calculate)!=# +#-load(/bootmenu/bootparam.config)-# splash nox; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)!=&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:calculate nox; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)==&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# splash=off nox; +#pkg# + +cld-builder +#?os_builder_linux_subname!=# +#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-# Builder +#os_builder_linux_subname# +#?os_builder_linux_subname==# +#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# Builder +#os_builder_linux_subname# +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#?pkg(media-gfx/plymouth-themes-calculate)!=# +#-load(/bootmenu/bootparam.config)-# splash scratch; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)!=&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:calculate scratch; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)==&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# splash=off scratch; +#pkg# +FOOTER diff --git a/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/server.config b/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/server.config new file mode 100644 index 000000000..da1752fa8 --- /dev/null +++ b/profiles/templates/2.2/builder/iso/00-bootmenu/2.2.32.1/server.config @@ -0,0 +1,56 @@ +# Calculate name=system.config os_builder_linux_system!=desktop&&cl_ver>=2.2.32.1 +HEADER +cds +#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#?pkg(media-gfx/plymouth-themes-calculate)!=# +#-load(/bootmenu/bootparam.config)-# splash elevator=deadline; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)!=&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:calculate elevator=deadline; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)==&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# splash=off elevator=deadline; +#pkg# + +cds-docache +#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM) +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#?pkg(media-gfx/plymouth-themes-calculate)!=# +#-load(/bootmenu/bootparam.config)-# splash elevator=deadline docache; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)!=&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:calculate elevator=deadline docache; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)==&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# splash=off elevator=deadline docache; +#pkg# + +#?pkg(media-gfx/splash-themes-calculate)!=# +cds-nofb + #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-FB) +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#-load(/bootmenu/bootparam.config)-# splash=off elevator=deadline docache; +#pkg# + +cds-builder +#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# Builder +/boot/vmlinuz +#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg# +/boot/initrd +#?pkg(media-gfx/plymouth-themes-calculate)!=# +#-load(/bootmenu/bootparam.config)-# splash elevator=deadline scratch; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)!=&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:calculate elevator=deadline scratch; +#pkg# +#?pkg(media-gfx/splash-themes-calculate)==&&pkg(media-gfx/plymouth-themes-calculate)==# +#-load(/bootmenu/bootparam.config)-# splash=off elevator=deadline scratch; +#pkg# +FOOTER diff --git a/profiles/templates/2.2/builder/iso/00-bootmenu/desktop.config b/profiles/templates/2.2/builder/iso/00-bootmenu/desktop.config index ac60ed2d9..1f6ba217c 100644 --- a/profiles/templates/2.2/builder/iso/00-bootmenu/desktop.config +++ b/profiles/templates/2.2/builder/iso/00-bootmenu/desktop.config @@ -1,4 +1,4 @@ -# Calculate name=system.config os_builder_linux_system==desktop +# Calculate name=system.config os_builder_linux_system==desktop&&cl_ver<2.2.32.1 HEADER cld #?os_builder_linux_subname!=# diff --git a/profiles/templates/2.2/builder/iso/00-bootmenu/server.config b/profiles/templates/2.2/builder/iso/00-bootmenu/server.config index 368e6b2a2..21f2e0a10 100644 --- a/profiles/templates/2.2/builder/iso/00-bootmenu/server.config +++ b/profiles/templates/2.2/builder/iso/00-bootmenu/server.config @@ -1,4 +1,4 @@ -# Calculate name=system.config os_builder_linux_system!=desktop +# Calculate name=system.config os_builder_linux_system!=desktop&&cl_ver<2.2.32.1 HEADER cds #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# diff --git a/profiles/templates/2.2/builder/iso/grub/uefi_isohibryd b/profiles/templates/2.2/builder/iso/grub/uefi_isohibryd index 9515cdcac..200b624d6 100644 --- a/profiles/templates/2.2/builder/iso/grub/uefi_isohibryd +++ b/profiles/templates/2.2/builder/iso/grub/uefi_isohibryd @@ -8,6 +8,7 @@ CD_GRUB_DIR=${CDROOT_DIR}/boot/grub MEMDISK=${CDROOT_DIR}/memdisk.img ID_FILE=id${RANDOM}.uefi +rm -f ${CDROOT_DIR}/id*.uefi touch ${CDROOT_DIR}/${ID_FILE} mkdir -p ${BOOT_GRUB_DIR}