SAWADA Keiji
card_capto****@users*****
2006年 2月 26日 (日) 04:23:41 JST
Index: dlkit2/sv.setup diff -u dlkit2/sv.setup:1.4 dlkit2/sv.setup:1.5 --- dlkit2/sv.setup:1.4 Sat Feb 25 13:03:27 2006 +++ dlkit2/sv.setup Sun Feb 26 04:23:41 2006 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh # sv.setup - setup script starter for server-side # Copyright (c) 2005-2006 SAWADA Keiji <card_capto****@users*****> # @@ -94,7 +94,7 @@ case "$BOOT_TYPE" in newboot) - use_instroot=true # rootdir on NFS (install-time) + use_instroot=true # rootdir on NFS at install-time ;; *) perror "BOOT_TYPE should be newboot" @@ -322,7 +322,6 @@ cp $SV_DVDDIR/boot/multiboot /tftpboot/boot echon " menu.lst" -# apply_m4 -DINSTALL sv.grub-menu.m4 > /tftpboot/boot/grub/menu.lst apply_m4 -DINSTUPDATE1 sv.grub-menu.m4 > /tftpboot/boot/grub/menu.lst echo " done" @@ -330,38 +329,11 @@ prepare_tftpboot() { case "$BOOT_TYPE" in - bootbin) prepare_tftpboot_bootbin ;; - newboot) prepare_tftpboot_newboot ;; + newboot) prepare_tftpboot_newboot ;; esac } #---------------------------------------------------------------------- -check_tftpboot_bootbin() { - echon "Checking TFTP accessibility... " - tftp=`typep tftp` - #tftp=/bin/true # debug - if [ -x "$tftp" ]; then - echo "get /nbp.SUNW.i86pc .v.nbp" | $tftp $SV_NAME > /dev/null 2>&1 - echo "get /SUNW.i86pc .v.inetboot" | $tftp $SV_NAME > /dev/null 2>&1 - - warn_tftp=false - diff .v.nbp /tftpboot/nbp.SUNW.i86pc > /dev/null 2>&1 || warn_tftp=true - diff .v.inetboot /tftpboot/SUNW.i86pc > /dev/null 2>&1 || warn_tftp=true - - if $warn_tftp; then - echo "failed" - echo $asserta - echo "Failed to retrieve file(s) from TFTP server." - echo "Probably TFTP server is not running." - echo $assertz - else - echo "done" - fi - else - echo "skipped, 'tftp' command missing" - fi -} - check_tftpboot_newboot() { echon "Checking TFTP accessibility... " tftp=`typep tftp` @@ -391,28 +363,19 @@ check_tftpboot() { case "$BOOT_TYPE" in bootbin) check_tftpboot_bootbin ;; -# newboot) check_tftpboot_newboot ;; esac } #---------------------------------------------------------------------- -generate_dhcpd_conf_bootbin() { +generate_dhcpd_conf_newboot() { echon "Generating DHCP configuration file... " apply_m4 -DCONFIG_INSTALLATION sv.dhcpd.conf.m4 > sv.dhcpd-inst.conf apply_m4 -DCONFIG_FINAL_ENV sv.dhcpd.conf.m4 > sv.dhcpd-fin.conf echo "done" } -generate_dhcpd_conf_newboot() { - echon "Generating DHCP configuration file... " - apply_m4 -DCONFIG_INSTALLATION so.dhcpd.conf.m4 > sv.dhcpd-inst.conf - apply_m4 -DCONFIG_FINAL_ENV so.dhcpd.conf.m4 > sv.dhcpd-fin.conf - echo "done" -} - start_dhcpd() { case "$BOOT_TYPE" in - bootbin) generate_dhcpd_conf_bootbin ;; newboot) generate_dhcpd_conf_newboot ;; esac @@ -461,7 +424,7 @@ echo "timeserver=$CL_SYSIDCFG_TIMESERVER" if [ -f "$CL_SYSIDCFG_X" ]; then cat "$CL_SYSIDCFG_X"; fi ) > $SV_DVDDIR/fake-jumpstart/sysidcfg - echo "終了" + echo "done" fi } @@ -672,14 +635,11 @@ mkdir $trandir/pkgs.done case "$BOOT_TYPE" in - bootbin|newboot) + newboot) # client can access directly + (cd $SV_INSTROOT && rm -rf $trandir) cp -r $trandir $SV_INSTROOT/$trandir ;; -# newboot) -# # client have to use TFTP to get it -# tar cf /tftpboot/trandir.tar $trandir -# ;; esac echo "done" @@ -714,6 +674,7 @@ SunOS) DEVICE=`lofiadm -a $SV_DVDDIR/miniroot.extd` mount -F ufs -r $DEVICE $SV_DVDDIR/pnt + # XXX TODO lofiadm -d ;; Linux) mount -o loop -t ufs $SV_DVDDIR/miniroot.extd $SV_DVDDIR/pnt
