From 957a2a3c9a3cb36949af309b5507ca6d2e4be4a5 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 11 Mar 2011 11:26:34 +0300 Subject: [PATCH] Remove cl_install_scratch_action logic. --- install/1system/calculate-install/calculate2.env | 1 + install/1system/grub/grub.conf | 2 +- install/1system/grub/grub.conf.scratch | 2 +- install/1system/grub/grub.conf.usb | 2 +- install/1system/openrc/init.d/root | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/install/1system/calculate-install/calculate2.env b/install/1system/calculate-install/calculate2.env index ae3a597..d83a0f6 100644 --- a/install/1system/calculate-install/calculate2.env +++ b/install/1system/calculate-install/calculate2.env @@ -17,5 +17,6 @@ cl_autoupdate_set = off cl_kernel_uid = #-cl_install_kernel_uid-# #os_install_linux_ver# #?os_install_linux_build!=# +# current linux build os_linux_build = #-os_install_linux_build-# #os_install_linux_build# diff --git a/install/1system/grub/grub.conf b/install/1system/grub/grub.conf index 7e94ace..5be5638 100644 --- a/install/1system/grub/grub.conf +++ b/install/1system/grub/grub.conf @@ -1,4 +1,4 @@ -# Calculate comment=# cl_install_scratch_action!=up&&os_install_root_type!=usb-hdd +# Calculate comment=# os_install_scratch==off&&os_install_root_type!=usb-hdd timeout 2 default 0 fallback 1 diff --git a/install/1system/grub/grub.conf.scratch b/install/1system/grub/grub.conf.scratch index 24fb044..2eaffe6 100644 --- a/install/1system/grub/grub.conf.scratch +++ b/install/1system/grub/grub.conf.scratch @@ -1,4 +1,4 @@ -# Calculate comment=# name=grub.conf cl_install_scratch_action==up +# Calculate comment=# name=grub.conf os_install_scratch==on timeout 5 default 0 fallback 1 diff --git a/install/1system/grub/grub.conf.usb b/install/1system/grub/grub.conf.usb index 299fcfe..d298ecb 100644 --- a/install/1system/grub/grub.conf.usb +++ b/install/1system/grub/grub.conf.usb @@ -1,4 +1,4 @@ -# Calculate comment=# name=grub.conf cl_install_scratch_action!=up&&os_install_root_type==usb-hdd +# Calculate comment=# name=grub.conf os_install_scratch==off&&os_install_root_type==usb-hdd timeout 2 default 0 fallback 1 diff --git a/install/1system/openrc/init.d/root b/install/1system/openrc/init.d/root index 631dcaa..5c6fd62 100644 --- a/install/1system/openrc/init.d/root +++ b/install/1system/openrc/init.d/root @@ -1,4 +1,4 @@ -# Calculate cl_install_scratch_action==up chmod=0755 +# Calculate os_install_scratch==on chmod=0755 #!/sbin/runscript description="Mount the root fs read/write"