SAWADA Keiji
card_capto****@users*****
2006年 3月 12日 (日) 17:10:11 JST
Index: dlkit2/sv/add-client.sub
diff -u dlkit2/sv/add-client.sub:1.1.2.1 dlkit2/sv/add-client.sub:1.1.2.2
--- dlkit2/sv/add-client.sub:1.1.2.1 Sun Mar 12 14:18:57 2006
+++ dlkit2/sv/add-client.sub Sun Mar 12 17:10:11 2006
@@ -195,9 +195,10 @@
attempt, but it is unlikely to complete. If NFS doesn't export them
realy, export following directories and run this script again.
-Client needs to be suid-enabled, readable and writable as root. See
-man exports (on most Unix systems) or man dfstab (on Solaris family)
-for more detail.
+Clients need read/write access as root. In addition, shared file can
+be suid-enabled. See "exports" manual page (on most Unix systems) or
+dfstab manual page (on Solaris family) for more detail.
+
EOF
echon "Directories to be exported:"
test ! -f $cachedir/instdir_exported && echon " $SV_DVDDIR"
@@ -326,12 +327,12 @@
#----------------------------------------------------------------------
# TFTP stuff
-menu=`echo $CL_MAC | sed -e ''`
-
generate_menu_list() {
# subroutine for generating GRUB menu.lst file
- apply_m4 -DINSTUPDATE1 sv/grub-menu.m4 > $cl_pool/menu-inst.lst
- apply_m4 -DPOSTUPDATE1 sv/grub-menu.m4 > $cl_pool/menu-fin.lst
+ apply_m4 -Dinsttype_${INSTALL_TYPE} -Dstage_install \
+ sv/grub-menu.m4 > $cl_pool/menu-inst.lst
+ apply_m4 -Dinsttype_${INSTALL_TYPE} -Dstage_postinstall \
+ sv/grub-menu.m4 > $cl_pool/menu-fin.lst
}
prepare_tftpboot_newboot() {
Index: dlkit2/sv/finish-client.sub
diff -u dlkit2/sv/finish-client.sub:1.1.2.1 dlkit2/sv/finish-client.sub:1.1.2.2
--- dlkit2/sv/finish-client.sub:1.1.2.1 Sun Mar 12 14:18:57 2006
+++ dlkit2/sv/finish-client.sub Sun Mar 12 17:10:11 2006
@@ -1,4 +1,14 @@
#!/bin/sh
+# -*- shell-script -*-
+# finish-client.sub - finish installation; prepare normal boot environment.
+#
+# Copyright (c) 2006 SAWADA Keiji <card_capto****@users*****>
+#
+# This program is free software and has two license options; GNU
+# General Public License, or Common Development and Distribution
+# License. You can and must select one when you redistribute and/or
+# modify this program. Whatever you choose, this software comes with
+# absolutely no warranty.
set -eux
cl_pool=pool/$CL_CONFIG
Index: dlkit2/sv/grub-menu.m4
diff -u dlkit2/sv/grub-menu.m4:1.1.2.1 dlkit2/sv/grub-menu.m4:1.1.2.2
--- dlkit2/sv/grub-menu.m4:1.1.2.1 Sun Mar 12 14:18:57 2006
+++ dlkit2/sv/grub-menu.m4 Sun Mar 12 17:10:11 2006
@@ -1,96 +1,54 @@
default=1
timeout=10
-
-dnl ######################################################################
-ifdef(`INSTUPDATE1', `dnl
-define(`LOADER', ``/boot/multiboot'')dnl
-define(`KERNFILE', ``kernel/unix'')dnl
-define(`MODULE', ``/boot/boot_archive.''CL_NAME``.inst'')dnl
-define(`PROPDEF', `fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_INSTROOT')dnl
-
-title Install Solaris (diskless-kit)
- kernel LOADER KERNFILE - nowin -B PROPDEF
- module MODULE
-
-title Install Solaris with kernel debugger (diskless-kit)
- kernel LOADER KERNFILE -kv - nowin -B PROPDEF
- module MODULE
-')dnl
dnl
-dnl ######################################################################
-ifdef(`POSTUPDATE1', `dnl
+dnl Common definitions
+define(`XTRA_PROP', ifdef(`EXTRA_PROP', `EXTRA_PROP', `'))dnl
define(`LOADER', ``/boot/multiboot'')dnl
define(`KERNFILE', ``kernel/unix'')dnl
-define(`MODULE', ``/boot/boot_archive.''CL_NAME)dnl
-define(`PROPDEF', `fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_FIN_ROOT')dnl
-
-title Solaris (diskless-kit)
- kernel LOADER KERNFILE -B PROPDEF
- module MODULE
-
-title Solaris with kernel debugger (diskless-kit)
- kernel LOADER KERNFILE -kv -B PROPDEF
- module MODULE
-')dnl
+define(`COMMON_PROP', XTRA_PROP`fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME')dnl
+define(`INSTALL_MODULE', ``/boot/boot_archive.''CL_NAME``.inst'')dnl
+define(`POSTINSTALL_MODULE', ``/boot/boot_archive.''CL_NAME)dnl
dnl
-dnl ######################################################################
-ifdef(`DISKLESSIFY', `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 Disklessify Solaris (PXE) * Remove this section later
- kernel LOADER KERNFILE - nowin -B PROPDEF
- module MODULE
-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 disklessfying
- kernel LOADER KERNFILE -B POSTPROPDEF
- module MODULE
-title Solaris with kernel debugger (PXE) * use this section after disklessifying
- kernel LOADER KERNFILE -kv -B POSTPROPDEF
- module MODULE
-')dnl
+dnl Template
+dnl ifdef(`insttype_xxx', ifdef(`stage_install', `dnl
+dnl ')ifdef(`stage_postinstall', `dnl
+dnl ')dnl
dnl
dnl ######################################################################
-ifdef(`NETINSTALL', `dnl
-define(`LOADER', ``/boot/multiboot'')dnl
-define(`KERNFILE', ``kernel/unix'')dnl
-define(`MODULE', ``/boot/boot_archive'')dnl
-define(`PROPDEF', `install_media=SV_IPADDR:SV_DVDDIR,fstype=nfs,server-ip=SV_IPADDR,server-name=SV_NAME,server-path=SV_INSTROOT')dnl
-#----------------------------------------------------------------------
+dnl
+ifdef(`stage_install', `dnl
+ ifdef(`insttype_diskless', `dnl
+ define(`PROPDEF', `COMMON_PROP,server-path=SV_INSTROOT')dnl
+ define(`CREDIT', `(dlkit2, type diskless)')dnl
+ ')dnl
+ ifdef(`insttype_disklessify', `dnl
+ define(`PROPDEF', `COMMON_PROP,server-path=SV_INSTROOT')dnl
+ define(`CREDIT', `(dlkit2, type disklessify)')dnl
+ ')dnl
+ ifdef(`insttype_netinstall', `dnl
+ define(`PROPDEF', `COMMON_PROP,server-path=SV_INSTROOT,install_media=SV_IPADDR:SV_DVDDIR')dnl
+ define(`CREDIT', `(dlkit2, type netinstall)')dnl
+ ')dnl
-title Install Solaris (PXE)
+title Solaris installation CREDIT
kernel LOADER KERNFILE - nowin -B PROPDEF
- module MODULE
-title Install Solaris with kernel debugger (PXE)
+ module INSTALL_MODULE
+
+title Solaris installation under kernel debugger CREDIT
kernel LOADER KERNFILE -kv - nowin -B PROPDEF
- module MODULE
+ module INSTALL_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
-#----------------------------------------------------------------------
+dnl
+ifdef(`stage_postinstall', `dnl
+ define(`PROPDEF', `COMMON_PROP,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
+title Solaris
+ kernel LOADER KERNFILE -B PROPDEF
+ module POSTINSTALL_MODULE
+
+title Solaris under kernel debugger
+ kernel LOADER KERNFILE -kv -B PROPDEF
+ module POSTINSTALL_MODULE
')dnl
Index: dlkit2/sv/install-client.sub
diff -u dlkit2/sv/install-client.sub:1.1.2.1 dlkit2/sv/install-client.sub:1.1.2.2
--- dlkit2/sv/install-client.sub:1.1.2.1 Sun Mar 12 14:18:57 2006
+++ dlkit2/sv/install-client.sub Sun Mar 12 17:10:11 2006
@@ -1,6 +1,15 @@
#!/bin/sh
# -*- shell-script -*-
-# install-client:
+# install-client: setup installation environment at server side.
+#
+# Copyright (c) 2005-2006 SAWADA Keiji <card_capto****@users*****>
+# Copyright (c) 2005-2006 teelime <teeli****@users*****>
+#
+# This program is free software and has two license options; GNU
+# General Public License, or Common Development and Distribution
+# License. You can and must select one when you redistribute and/or
+# modify this program. Whatever you choose, this software comes with
+# absolutely no warranty.
set -eu
cl_pool=pool/${CL_CONFIG:?"CL_CONFIG not set"}
Index: dlkit2/sv/non-std-driver-setup.sh
diff -u dlkit2/sv/non-std-driver-setup.sh:1.1.2.1 dlkit2/sv/non-std-driver-setup.sh:1.1.2.2
--- dlkit2/sv/non-std-driver-setup.sh:1.1.2.1 Sun Mar 12 14:18:57 2006
+++ dlkit2/sv/non-std-driver-setup.sh Sun Mar 12 17:10:11 2006
@@ -3,6 +3,14 @@
# sv.non-std-driver-setup - create script to install third party driver.
#
# Usage: non-std-driver-setup {server | offline | client} [dest_base_dir]
+#
+# Copyright (c) 2005-2006 SAWADA Keiji <card_capto****@users*****>
+#
+# This program is free software and has two license options; GNU
+# General Public License, or Common Development and Distribution
+# License. You can and must select one when you redistribute and/or
+# modify this program. Whatever you choose, this software comes with
+# absolutely no warranty.
NAME=${1:?}
DEST_DIR=${2:-.}
Index: dlkit2/sv/offline-installer.sub
diff -u dlkit2/sv/offline-installer.sub:1.1.2.1 dlkit2/sv/offline-installer.sub:1.1.2.2
--- dlkit2/sv/offline-installer.sub:1.1.2.1 Sun Mar 12 14:18:57 2006
+++ dlkit2/sv/offline-installer.sub Sun Mar 12 17:10:11 2006
@@ -1,5 +1,14 @@
#!/bin/sh
# -*- shell-script -*-
+# offline-installer.sub - install Solaris within server space.
+#
+# Copyright (c) 2005-2006 SAWADA Keiji <card_capto****@users*****>
+#
+# This program is free software and has two license options; GNU
+# General Public License, or Common Development and Distribution
+# License. You can and must select one when you redistribute and/or
+# modify this program. Whatever you choose, this software comes with
+# absolutely no warranty.
trandir=cl.trandir
. $trandir/config.in