diff --git a/builder/iso/calcboot/isolinux/isolinux.cfg.desktop b/builder/iso/calcboot/isolinux/isolinux.cfg.desktop index 1cdc16e..5dc983d 100644 --- a/builder/iso/calcboot/isolinux/isolinux.cfg.desktop +++ b/builder/iso/calcboot/isolinux/isolinux.cfg.desktop @@ -1,5 +1,8 @@ # Calculate name=isolinux.cfg os_builder_linux_system==desktop&&pkg(sys-kernel/calculate-sources)>=2.6.32.33&&pkg(sys-kernel/calculate-sources)<2.6.33||os_builder_linux_system==desktop&&pkg(sys-kernel/calculate-sources)>=2.6.37.4 DEFAULT calcmenu.c32 +#?pkg(sys-boot/calcboot)>=3.86.5&&cl_builder_kernel_cmd!=# +DEFAULTPARAM #-cl_builder_kernel_cmd-# +#pkg# INCLUDE common.cfg MENU TITLE Welcome to Calculate Linux (#-os_builder_arch_machine-#) @@ -12,7 +15,7 @@ LABEL cld MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# #os_builder_linux_subname# KERNEL /boot/vmlinuz - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi scandelay=3 LABEL cld-docache #?os_builder_linux_subname!=# @@ -22,7 +25,7 @@ LABEL cld-docache MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM) #os_builder_linux_subname# KERNEL /boot/vmlinuz - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi docache scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi docache scandelay=3 LABEL cld-nox #?os_builder_linux_subname!=# @@ -32,7 +35,7 @@ LABEL cld-nox MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-X) #os_builder_linux_subname# KERNEL /boot/vmlinuz - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi nox scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi nox scandelay=3 LABEL cld-builder #?os_builder_linux_subname!=# @@ -42,7 +45,7 @@ LABEL cld-builder MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# Builder #os_builder_linux_subname# KERNEL /boot/vmlinuz - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi scratch scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi scratch scandelay=3 LABEL memtest MENU LABEL Memtest86+ diff --git a/builder/iso/calcboot/isolinux/isolinux.cfg.server b/builder/iso/calcboot/isolinux/isolinux.cfg.server index 7197e14..204f380 100644 --- a/builder/iso/calcboot/isolinux/isolinux.cfg.server +++ b/builder/iso/calcboot/isolinux/isolinux.cfg.server @@ -1,6 +1,9 @@ # Calculate name=isolinux.cfg os_builder_linux_system==server&&pkg(sys-kernel/calculate-sources)>=2.6.32.33&&pkg(sys-kernel/calculate-sources)<2.6.33||os_builder_linux_system==server&&pkg(sys-kernel/calculate-sources)>=2.6.37.4 DEFAULT calcmenu.c32 INCLUDE common.cfg +#?pkg(sys-boot/calcboot)>=3.86.5&&cl_builder_kernel_cmd!=# +DEFAULTPARAM #-cl_builder_kernel_cmd-# +#pkg# MENU TITLE Welcome to Calculate Linux (#-os_builder_arch_machine-#) @@ -8,37 +11,37 @@ LABEL cds MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# KERNEL /boot/vmlinuz #?os_builder_linux_shortname!=CSS# - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline scandelay=3 #os_builder_linux_shortname# #?os_builder_linux_shortname==CSS# - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scandelay=3 #os_builder_linux_shortname# LABEL cds-docache MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM) KERNEL /boot/vmlinuz #?os_builder_linux_shortname!=CSS# - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline docache scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline docache scandelay=3 #os_builder_linux_shortname# #?os_builder_linux_shortname==CSS# - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off docache scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off docache scandelay=3 #os_builder_linux_shortname# #?os_builder_linux_shortname!=CSS# LABEL cds-nofb MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-FB) KERNEL /boot/vmlinuz - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scandelay=3 #os_builder_linux_shortname# LABEL cds-builder MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# Builder KERNEL /boot/vmlinuz #?os_builder_linux_shortname!=CSS# - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline scratch scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline scratch scandelay=3 #os_builder_linux_shortname# #?os_builder_linux_shortname==CSS# - APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scratch scandelay=3 #-cl_builder_kernel_cmd-# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scratch scandelay=3 #os_builder_linux_shortname# #?os_builder_linux_shortname!=CSS#