From 3ea5651668a4f67f9815c42cc0a9a3b66b942009 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 20 Jul 2011 12:56:45 +0400 Subject: [PATCH] Fix for grub2. Update motd message. --- builder/squash/etc/calculate/calculate2.env | 3 +++ install/1merge/baselayout/motd.en | 8 ++++++-- install/1merge/baselayout/motd.ru | 10 ++++++++++ install/1merge/grub2/update-grub | 4 +++- install/1system/grub/device.map | 1 + 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/builder/squash/etc/calculate/calculate2.env b/builder/squash/etc/calculate/calculate2.env index 2f499e2..e6e2c4d 100644 --- a/builder/squash/etc/calculate/calculate2.env +++ b/builder/squash/etc/calculate/calculate2.env @@ -10,3 +10,6 @@ os_linux_build = #-os_builder_linux_build-# #?os_builder_linux_build==||pkg(sys-apps/calculate-lib)<=2.2.2# !os_linux_build = empty #os_builder_linux_build# + +[install] +!os_install_net_settings = empty diff --git a/install/1merge/baselayout/motd.en b/install/1merge/baselayout/motd.en index eef29e7..0eace80 100644 --- a/install/1merge/baselayout/motd.en +++ b/install/1merge/baselayout/motd.en @@ -3,11 +3,15 @@ Welcome to the #-os_install_linux_name-# Installation CD! If any ethernet adapters were detected at boot, they should be auto-configured if DHCP is available on your network. +To specify network settings, use utility "cl_install". +Example:"cl-install --live --ip 192.168.1.100/24 \ + --route default:192.168.1.1 \ + --dns 192.168.1.1" #?os_install_linux_system==server||os_install_linux_shortname==CLS# -Type "net-setup eth0" to specify eth0 IP address settings by hand. +And restart net.eth0 by command "/etc/init.d/net.eth0 restart". #os_install_linux_system# #?os_install_linux_system==desktop&&os_install_linux_shortname!=CLS# -Type "wicd-curses" to specify eth0 IP address settings by hand. +And restart NetworkManager by command "/etc/init.d/NetworkManager restart". #os_install_linux_system# The latest version of the Handbook is always available from the Calculate Linux diff --git a/install/1merge/baselayout/motd.ru b/install/1merge/baselayout/motd.ru index 639a782..c9fbad8 100644 --- a/install/1merge/baselayout/motd.ru +++ b/install/1merge/baselayout/motd.ru @@ -3,6 +3,16 @@ Если какой-либо из сетевых адаπтеров был обнаружен πри загрузке, он будет автоматически сконфигурирован, если в сети достуπен DHCP сервер. +Для указания сетевых настроек используйте утилиту "cl-install". +Пример:"cl-install --live --ip 192.168.1.100/24 \ + --route default:192.168.1.1 \ + --dns 192.168.1.1" +#?os_install_linux_system==server||os_install_linux_shortname==CLS# +И перезапустите net.eth0 командой "/etc/init.d/net.eth0 restart". +#os_install_linux_system# +#?os_install_linux_system==desktop&&os_install_linux_shortname!=CLS# +И перезапустите NetworkManager командой "/etc/init.d/NetworkManager restart". +#os_install_linux_system# #?os_install_linux_system==server||os_install_linux_shortname==CLS# Выπолните "net-setup eth0" для указания сетевой карты и IP адреса вручную. #os_install_linux_system# diff --git a/install/1merge/grub2/update-grub b/install/1merge/grub2/update-grub index 561679f..9ffe0a3 100644 --- a/install/1merge/grub2/update-grub +++ b/install/1merge/grub2/update-grub @@ -1,3 +1,5 @@ # Calculate path=/tmp exec=/bin/bash os_install_root_type!=livecd&&exists(/sbin/grub-mkconfig,root)!= -CHROOT_PATH=#-cl_chroot_grub-# /sbin/grub-mkconfig >#-cl_chroot_path-#/boot/grub/grub.cfg 2>/dev/null +/sbin/grub-mkdevicemap +/sbin/grub-mkdevicemap -m #-cl_chroot_path-#/boot/grub/device.map +CHROOT_PATH=#-cl_chroot_grub-# /sbin/grub-mkconfig -o #-cl_chroot_path-#/boot/grub/grub.cfg 2>/dev/null diff --git a/install/1system/grub/device.map b/install/1system/grub/device.map index 730cb1e..9d3e84f 100644 --- a/install/1system/grub/device.map +++ b/install/1system/grub/device.map @@ -1 +1,2 @@ +# Calculate os_grub2_path== #-os_install_grub_devicemap_conf-#