teelime
teeli****@users*****
2006年 3月 9日 (木) 03:51:54 JST
Index: dlkit2/sv.setup
diff -u dlkit2/sv.setup:1.14 dlkit2/sv.setup:1.15
--- dlkit2/sv.setup:1.14 Fri Mar 3 09:52:54 2006
+++ dlkit2/sv.setup Thu Mar 9 03:51:54 2006
@@ -81,16 +81,24 @@
check_install_type() {
case "$INSTALL_TYPE" in
disklessify)
- use_dvddir=false # already installed
+ use_dvddir=true # already installed, but needed by mini-nfsroot
+ use_instroot=true # rootdir on NFS at install-time
use_fin_root=true # rootdir on NFS (post-install)
;;
- diskless|offline)
+ netinstall)
+ use_dvddir=true # going to install
+ use_instroot=true # rootdir on NFS at install-time
+ use_fin_root=false # rootdir on hard drive (post-install)
+ ;;
+ diskless)
use_dvddir=true # going to install
+ use_instroot=true # rootdir on NFS at install-time
use_fin_root=true # rootdir on NFS (post-install)
;;
- netinstall)
+ offline)
use_dvddir=true # going to install
- use_fin_root=false # rootdir on hard drive (post-install)
+ use_instroot=false # rootdir... ?
+ use_fin_root=true # rootdir on NFS (post-install)
;;
*)
perror "choose INTALL_TYPE value from: disklessify, netinstall, diskless, offline"
@@ -99,7 +107,6 @@
case "$BOOT_TYPE" in
newboot)
- use_instroot=true # rootdir on NFS at install-time
;;
*)
perror "BOOT_TYPE should be newboot"
@@ -327,7 +334,20 @@
cp $SV_DVDDIR/boot/multiboot /tftpboot/boot
echon " menu.lst"
- apply_m4 -DINSTUPDATE1 sv.grub-menu.m4 > /tftpboot/boot/grub/menu.lst
+
+ case "$INSTALL_TYPE" in
+ disklessify)
+ apply_m4 -DDISKLESSIFY sv.grub-menu.m4 > $SV_PXEBOOTDIR/grub/menu.lst
+ ;;
+ netinstall)
+ apply_m4 -DNETINSTALL sv.grub-menu.m4 > $SV_PXEBOOTDIR/grub/menu.lst
+ ;;
+ diskless)
+ apply_m4 -DDISKLESS sv.grub-menu.m4 > $SV_PXEBOOTDIR/grub/menu.lst
+ ;;
+ *)
+ ;;
+ esac
echo " done"
}
@@ -453,7 +473,10 @@
prepare_installation_env() {
echon "Preparing installation environment..."
- echon " SMF repository"
+ echon " /tmp/root directory"
+ copy_hier $SV_INSTROOT/.tmp_proto/root/etc $SV_INSTROOT/tmp/root/etc
+
+ echon ", SMF repository"
backup_distfile $SV_INSTROOT/etc/svc/repository.db
rm -f $SV_INSTROOT/etc/svc/repository-boot*
@@ -483,27 +506,24 @@
echo "setprop kbd-type '$CL_KEYBOARD'" >> $SV_INSTROOT/boot/solaris/bootenv.rc
fi
- if [ ! -z "$CL_NFS_CLIENT_VERSION" ]; then
- echon ", NFS protocol version"
- backup_distfile $SV_INSTROOT/etc/default/nfs
- (cat $SV_INSTROOT/etc/default/nfs.dist
- echo "NFS_CLIENT_VERSMAX=$CL_NFS_CLIENT_VERSION"
- ) > $SV_INSTROOT/etc/default/nfs
- fi
+ echo '.'
+}
- echon ", boot scripts"
+setup_install_kicker() {
+ echo "Preparing installation script..."
# boot script and install script for install session
backup_distfile $SV_INSTROOT/sbin/install-setup
cp /dev/null $SV_INSTROOT/boot/solaris/bootargs.rc
-
case "$INSTALL_TYPE" in
disklessify)
cp -p cl.install-setup-disklessify $SV_INSTROOT/sbin/install-setup
;;
netinstall)
- cp -p $SV_INSTROOT/sbin/install-setup.dist \
- $SV_INSTROOT/sbin/install-setup
+ cp -p cl.post-install-netinstall $SV_INSTROOT/sbin/post-setup
+ echo "Reducing the limitation of physical memory size..."
+ echon " "
+ patch -p0 < install-setup-reduce-memory-limitation.patch $SV_INSTROOT/sbin/install-setup
;;
diskless)
@@ -513,11 +533,8 @@
offline)
;;
esac
-
- echo '.'
}
-
#----------------------------------------------------------------------
prepare_postinstall_env() {
echo "Preparing post-installation environment..."
@@ -681,7 +698,6 @@
perror "$SV_INSTROOT/a must be there"
fi
- copy_hier $SV_INSTROOT/.tmp_proto/root/etc $SV_INSTROOT/tmp/root/etc
}
#----------------------------------------------------------------------
@@ -712,6 +728,20 @@
}
#----------------------------------------------------------------------
+prepare_nfs_environment() {
+ echon "Preparing NFS protocol version..."
+
+ if [ ! -z "$CL_NFS_CLIENT_VERSION" ]; then
+ backup_distfile $SV_INSTROOT/etc/default/nfs
+ (cat $SV_INSTROOT/etc/default/nfs.dist
+ echo "NFS_CLIENT_VERSMAX=$CL_NFS_CLIENT_VERSION"
+ ) > $SV_INSTROOT/etc/default/nfs
+ fi
+
+ echo '.'
+}
+
+#----------------------------------------------------------------------
set -e
. ./config.in
@@ -719,9 +749,9 @@
OSTYPE=`uname -s`
remove_work_files
check_install_type
-[ "$INSTALL_TYPE" != "netinstall" -a "$BOOT_TYPE" = "newboot" ] && create_mininfsroot
+$use_instroot && create_mininfsroot
prepare_base_dirs
-$use_dvddir && enumerate_packages
+$use_fin_root && enumerate_packages
$use_fin_root && make_swap_file
check_nfs_export
prepare_tftpboot
@@ -730,10 +760,19 @@
[ $INSTALL_TYPE = netinstall ] && generate_sysidcfg
prepare_non_std_driver
$use_instroot && prepare_installation_env
+$use_instroot && prepare_nfs_environment
+$use_instroot && create_boot_archive
+if [ $INSTALL_TYPE = netinstall ]; then
+ /bin/rm -rf $SV_INSTROOT
+ create_mininfsroot # again
+ prepare_nfs_environment
+ mkdir -p $SV_INSTROOT/cdrom/Solaris_10/Tools/Boot
+ cp -p $SV_DVDDIR/Solaris_10/Tools/Boot/X*.cpio.bz2 $SV_INSTROOT/cdrom/Solaris_10/Tools/Boot
+fi
[ $INSTALL_TYPE = diskless ] && prepare_postinstall_env
[ $INSTALL_TYPE = offline ] && prepare_postinstall_env
-[ "$INSTALL_TYPE" != "netinstall" -a "$BOOT_TYPE" = "newboot" ] && create_boot_archive
transfer_installation_script
+$use_instroot && setup_install_kicker
finalize_1st_stage
exit
Index: dlkit2/sv.grub-menu.m4
diff -u dlkit2/sv.grub-menu.m4:1.3 dlkit2/sv.grub-menu.m4:1.4
--- dlkit2/sv.grub-menu.m4:1.3 Sat Mar 4 00:04:50 2006
+++ dlkit2/sv.grub-menu.m4 Thu Mar 9 03:51:54 2006
@@ -64,7 +64,7 @@
module MINIROOT
')dnl
dnl ######################################################################
-ifdef(`INSTUPDATE1', `dnl
+ifdef(`DISKLESSIFY', `dnl
define(`LOADER', ``/boot/multiboot'')dnl
define(`KERNFILE', ``kernel/unix'')dnl
define(`MODULE', ``/boot/boot_archive'')dnl
@@ -72,33 +72,55 @@
define(`POSTPROPDEF', `fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_FIN_ROOT')dnl
#----------------------------------------------------------------------
-title Install (or disklessify) Solaris (PXE) * You shuld remove this section after installing
+title Disklessify Solaris (PXE) * Remove this section later
kernel LOADER KERNFILE - nowin -B PROPDEF
module MODULE
-title Install (or disklessify) Solaris with kernel debugger (PXE) * You shuld remove this section after installing
+title Disklessify Solaris with kernel debugger (PXE) * Remove this section later
kernel LOADER KERNFILE -kv - nowin -B PROPDEF
module MODULE
-title Solaris (PXE) * Use this section after installing
+title Solaris (PXE) * Use this section after disklessfying
kernel LOADER KERNFILE -B POSTPROPDEF
module MODULE
-title Solaris with kernel debugger (PXE) * use this section after installing
+title Solaris with kernel debugger (PXE) * use this section after disklessifying
kernel LOADER KERNFILE -kv -B POSTPROPDEF
module MODULE
')dnl
dnl
dnl ######################################################################
-ifdef(`POSTUPDATE1', `dnl
+ifdef(`NETINSTALL', `dnl
define(`LOADER', ``/boot/multiboot'')dnl
define(`KERNFILE', ``kernel/unix'')dnl
define(`MODULE', ``/boot/boot_archive'')dnl
-define(`PROPDEF', `fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_FIN_ROOT')dnl
+define(`PROPDEF', `install_media=SV_IPADDR:SV_DVDDIR,fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_INSTROOT')dnl
#----------------------------------------------------------------------
-title Solaris (PXE)
- kernel LOADER KERNFILE -B PROPDEF
+title Install Solaris (PXE)
+ kernel LOADER KERNFILE - nowin -B PROPDEF
module MODULE
-title Solaris with kernel debugger (PXE)
- kernel LOADER KERNFILE -kv -B PROPDEF
+title Install Solaris with kernel debugger (PXE)
+ kernel LOADER KERNFILE -kv - nowin -B PROPDEF
module MODULE
')dnl
dnl
+dnl ######################################################################
+ifdef(`DISKLESS', `dnl
+define(`LOADER', ``/boot/multiboot'')dnl
+define(`KERNFILE', ``kernel/unix'')dnl
+define(`MODULE', ``/boot/boot_archive'')dnl
+define(`PROPDEF', `fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_INSTROOT')dnl
+define(`POSTPROPDEF', `fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_FIN_ROOT')dnl
+#----------------------------------------------------------------------
+
+title Install Solaris (PXE) * Remove this section later
+ kernel LOADER KERNFILE - nowin -B PROPDEF
+ module MODULE
+title Install Solaris with kernel debugger (PXE) * Remove this section later
+ kernel LOADER KERNFILE -kv - nowin -B PROPDEF
+ module MODULE
+title Solaris (PXE) * Use this section after installing
+ kernel LOADER KERNFILE -B POSTPROPDEF
+ module MODULE
+title Solaris with kernel debugger (PXE) * use this section after installing
+ kernel LOADER KERNFILE -kv -B POSTPROPDEF
+ module MODULE
+')dnl
Index: dlkit2/cl.post-install-netinstall
diff -u /dev/null dlkit2/cl.post-install-netinstall:1.1
--- /dev/null Thu Mar 9 03:51:54 2006
+++ dlkit2/cl.post-install-netinstall Thu Mar 9 03:51:54 2006
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+trandir=/cl.trandir
+. $trandir/config.in
+
+echo "Configuring post-installation Network Environment..."
+
+for f in /a/etc/hostname.???*; do
+ fn=`echo $f|sed s/hostname/dhcp/`
+ echo "touch $fn"
+ touch $fn
+done
+
+echo "127.0.0.1 localhost loghost" > /a/etc/inet/hosts
+
+
+echo "Rebooting..."
+#umount /a
+init 6
Index: dlkit2/install-setup-reduce-memory-limitation.patch
diff -u /dev/null dlkit2/install-setup-reduce-memory-limitation.patch:1.1
--- /dev/null Thu Mar 9 03:51:54 2006
+++ dlkit2/install-setup-reduce-memory-limitation.patch Thu Mar 9 03:51:54 2006
@@ -0,0 +1,26 @@
+--- install-setup.dist 2005-11-20 07:43:02.000000000 +0900
++++ install-setup.sun 2006-03-08 21:27:13.000000000 +0900
+@@ -141,13 +141,18 @@
+ MIN_GUI_SYSID_PHYSMEM=384
+ else
+ # on x86, ramdisk mini-root adds ~120Mb ramdisk
+- MIN_INSTALL_PHYSMEM=184
+- MIN_JAVA_INSTALL_PHYSMEM=504
++# MIN_INSTALL_PHYSMEM=184
++# MIN_JAVA_INSTALL_PHYSMEM=504
++ MIN_INSTALL_PHYSMEM=104
++ MIN_JAVA_INSTALL_PHYSMEM=424
+
+ # unpacking all of X into memory takes up around 150Mb
+- MIN_WINDOWING_PHYSMEM=400
+- MIN_GUI_INSTALL_PHYSMEM=504
+- MIN_GUI_SYSID_PHYSMEM=504
++# MIN_WINDOWING_PHYSMEM=400
++# MIN_GUI_INSTALL_PHYSMEM=504
++# MIN_GUI_SYSID_PHYSMEM=504
++ MIN_WINDOWING_PHYSMEM=320
++ MIN_GUI_INSTALL_PHYSMEM=424
++ MIN_GUI_SYSID_PHYSMEM=424
+ fi
+
+ # Free Virtual Memory Requirements. These numbers are