From 99fd3a3e30f45069c7f8fb617cc305e85786c4e4 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 10 Jun 2010 17:16:45 +0400 Subject: [PATCH] Fix css template --- Change.log | 3 ++- .../isolinux/isolinux.cfg?system=server | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Change.log b/Change.log index d1d5aed..9c5b361 100644 --- a/Change.log +++ b/Change.log @@ -5,7 +5,8 @@ CHANGE LOG * The use of man-db when building systems. * Added support Calculate Scratch Server. * Set guest uid=1000. -* Addid the mounting of /var/calculate/remote by cl-builder. +* Added the mounting of /var/calculate/remote by cl-builder. +* Changed isolinux template for CSS. 1.3.12 * Fix creating format a digest file. diff --git a/install/builder/profile/ISO/target/isolinux/isolinux.cfg?system=server b/install/builder/profile/ISO/target/isolinux/isolinux.cfg?system=server index c21bc04..9cd46ca 100755 --- a/install/builder/profile/ISO/target/isolinux/isolinux.cfg?system=server +++ b/install/builder/profile/ISO/target/isolinux/isolinux.cfg?system=server @@ -6,26 +6,45 @@ MENU TITLE Welcome to Calculate Linux (#-march-#) LABEL cds MENU LABEL #-calculatename-# #-linuxver-# LiveCD KERNEL /boot/vmlinuz +#?calculate!=CSS# APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline +#calculate# +#?calculate=CSS# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline splash=off +#calculate# LABEL cds-docache MENU LABEL #-calculatename-# #-linuxver-# LiveCD (RAM) KERNEL /boot/vmlinuz +#?calculate!=CSS# APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline docache +#calculate# +#?calculate=CSS# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline splash=off docache +#calculate# +#?calculate!=CSS# LABEL cds-nofb MENU LABEL #-calculatename-# #-linuxver-# LiveCD (No-FB) KERNEL /boot/vmlinuz APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline splash=off +#calculate# LABEL cds-builder MENU LABEL #-calculatename-# #-linuxver-# LiveCD Builder KERNEL /boot/vmlinuz +#?calculate!=CSS# APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline scratch +#calculate# +#?calculate=CSS# + APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline splash=off scratch +#calculate# +#?calculate!=CSS# LABEL memtest MENU LABEL Memtest86+ KERNEL memtest +#calculate# LABEL harddisk MENU LABEL Boot from first hard disk