SAWADA Keiji
card_capto****@users*****
2006年 2月 26日 (日) 15:27:35 JST
Index: dlkit2/Makefile
diff -u dlkit2/Makefile:1.3 dlkit2/Makefile:1.4
--- dlkit2/Makefile:1.3 Sun Feb 26 15:23:27 2006
+++ dlkit2/Makefile Sun Feb 26 15:27:35 2006
@@ -16,7 +16,7 @@
rm -f sv.dhcpd-*.conf so.dhcpd.conf
rm -f sv.grub-*.menu
rm -f cm.non-std-driver.* diskless-kit-v.texi diskless-kit.wiki
- rm -f cl.pkglist cl.boot.rc
+ rm -f cl.pkglist
if [ -d cl.etc ]; then rm -r cl.etc; fi
rm -f *.~*.~
rm -rf diskless-kit-config
Index: dlkit2/cl.diskless-installer
diff -u dlkit2/cl.diskless-installer:1.3 dlkit2/cl.diskless-installer:1.4
--- dlkit2/cl.diskless-installer:1.3 Sun Feb 26 01:57:58 2006
+++ dlkit2/cl.diskless-installer Sun Feb 26 15:27:35 2006
@@ -149,11 +149,6 @@
echo "set rb_args '$CL_FIN_BOOTFLAG'" \
> $CL_ROOT/boot/solaris/bootargs.rc
fi
-
- if [ -f $trandir/boot/solaris/boot.rc ]; then
- backup_distfile $CL_ROOT/boot/solaris/boot.rc
- cp $trandir/boot/solaris/boot.rc $CL_ROOT/boot/solaris/boot.rc
- fi
}
config_autofs() {
Index: dlkit2/sv.offline-installer
diff -u dlkit2/sv.offline-installer:1.1.1.1 dlkit2/sv.offline-installer:1.2
--- dlkit2/sv.offline-installer:1.1.1.1 Fri Feb 24 01:15:30 2006
+++ dlkit2/sv.offline-installer Sun Feb 26 15:27:35 2006
@@ -134,11 +134,6 @@
echo "set rb_args '$CL_FIN_BOOTFLAG'" \
> $CL_ROOT/boot/solaris/bootargs.rc
fi
-
- if [ -f $trandir/boot/solaris/boot.rc ]; then
- backup_distfile $CL_ROOT/boot/solaris/boot.rc
- cp $trandir/boot/solaris/boot.rc $CL_ROOT/boot/solaris/boot.rc
- fi
}
config_autofs() {
Index: dlkit2/sv.setup
diff -u dlkit2/sv.setup:1.5 dlkit2/sv.setup:1.6
--- dlkit2/sv.setup:1.5 Sun Feb 26 04:23:41 2006
+++ dlkit2/sv.setup Sun Feb 26 15:27:35 2006
@@ -362,7 +362,7 @@
check_tftpboot() {
case "$BOOT_TYPE" in
- bootbin) check_tftpboot_bootbin ;;
+ newboot) check_tftpboot_newboot ;;
esac
}
@@ -597,30 +597,6 @@
'*ldap*') echo 'ldap' > $trandir/nsswitch.templ ;;
esac
- # /boot/solaris/boot.rc
- if [ "x$BOOT_TYPE" = xbootbin ]; then
- if [ "x$CL_FIN_BOOT_RC" = "x*always_reconfigure*" ]; then
- cp $SV_INSTROOT/boot/solaris/boot.rc .v.boot.rc
- patch -p0 > /dev/null 2>&1 <<'EOF'
---- .v.boot.rc.ORG Sat Jul 9 09:20:02 2005
-+++ .v.boot.rc Sat Jul 9 09:20:12 2005
-@@ -25,6 +25,7 @@
-
- if .streq ( ${beenhere}X , X )
- source /boot/solaris/bootenv.rc
-+ set rb_args '-r' # always reconfigure
- source /boot/solaris/bootargs.rc
- set beenhere true
- endif
-EOF
- mkdir -p $trandir/boot/solaris
- mv .v.boot.rc $trandir/boot/solaris
- elif [ ! -z "$CL_FIN_BOOT_RC" ]; then
- mkdir -p $trandir/boot/solaris
- cp "$CL_FIN_BOOT_RC" $trandir/boot/solaris
- fi
- fi
-
echo " done"
}
@@ -629,7 +605,7 @@
echon "Transferring install scripts for client... "
required_files="config.in cl.diskless-installer cl.disklessify cl.pkgadd"
- optional_files="cl.nsswitch.templ cl.boot.rc"
+ optional_files="cl.nsswitch.templ"
cp $required_files $trandir
mkdir $trandir/pkgs.done