SAWADA Keiji
card_capto****@users*****
2006年 3月 3日 (金) 09:52:55 JST
Index: dlkit2/cl.diskless-installer
diff -u dlkit2/cl.diskless-installer:1.6 dlkit2/cl.diskless-installer:1.7
--- dlkit2/cl.diskless-installer:1.6 Fri Mar 3 09:23:42 2006
+++ dlkit2/cl.diskless-installer Fri Mar 3 09:52:54 2006
@@ -141,7 +141,7 @@
}
config_tmp() {
- echo "Configuring /tmp ..."
+ echo "Configuring /tmp..."
rm -rf $CL_ROOT/tmp
mkdir $CL_ROOT/tmp
chmod 1777 $CL_ROOT/tmp
@@ -157,6 +157,7 @@
) > $CL_ROOT/boot/solaris/bootenv.rc
fi
+ # TODO: CL_FIN_BOOTFLAG still valid for newboot?
if [ ! -z "$CL_FIN_BOOTFLAG" ]; then
echo "set rb_args '$CL_FIN_BOOTFLAG'" \
> $CL_ROOT/boot/solaris/bootargs.rc
@@ -174,9 +175,9 @@
}
config_package_reinstall_sh() {
-grep "pkgadd: ERROR" $LOGDIR/fake.*|cut -d"." -f2|cut -d":" -f1|sort -u > $CL_ROOT/package.lst
+ grep "pkgadd: ERROR" $LOGDIR/fake.* | cut -d"." -f2 | cut -d":" -f1 | sort -u > $CL_ROOT/package.lst
-cat > $CL_ROOT/package-reinstall.sh <<EOC
+ cat > $CL_ROOT/package-reinstall.sh <<EOC
#!/bin/sh
LANG=C
@@ -188,17 +189,17 @@
mkdir /cdrom 2>/dev/null
EOC
-if [ -z "$CL_MOUNT_OPTION" ]; then
-cat >> $CL_ROOT/package-reinstall.sh <<EOC
+ if [ -z "$CL_MOUNT_OPTION" ]; then
+ cat >> $CL_ROOT/package-reinstall.sh <<EOC
mount $SV_IPADDR:$SV_PKGDIR /cdrom
EOC
-else
-cat >> $CL_ROOT/package-reinstall.sh <<EOC
+ else
+ cat >> $CL_ROOT/package-reinstall.sh <<EOC
mount -o $CL_MOUNT_OPTION $SV_IPADDR:$SV_PKGDIR /cdrom
EOC
-fi
+ fi
-cat >> $CL_ROOT/package-reinstall.sh <<EOC
+ cat >> $CL_ROOT/package-reinstall.sh <<EOC
cd /cdrom
cat > \$ADMIN <<EOF
@@ -223,8 +224,8 @@
umount /cdrom
rm -f \$ADMIN
EOC
-chmod +x $CL_ROOT/package-reinstall.sh
-mkdir -p $CL_ROOT/etc/skel/.gnome2/panel2.d/default/launchers
+ chmod +x $CL_ROOT/package-reinstall.sh
+ mkdir -p $CL_ROOT/etc/skel/.gnome2/panel2.d/default/launchers
}
print_end_msg() {
@@ -232,8 +233,8 @@
echo ""
echo "First stage of installation is done."
echo "Following operations needed to complete installation:"
- echo " * (On server side) Change menu.lst(GRUB's configuration file) "
- echo " * under the tftp directory."
+ echo " * (On server side) Change menu.lst (GRUB's configuration file) "
+ echo " under the TFTP directory."
echo " * (On client side) Reboot this machine"
echo ""
echo "Good luck!"
Index: dlkit2/cl.disklessify
diff -u dlkit2/cl.disklessify:1.4 dlkit2/cl.disklessify:1.5
--- dlkit2/cl.disklessify:1.4 Fri Mar 3 01:10:32 2006
+++ dlkit2/cl.disklessify Fri Mar 3 09:52:54 2006
@@ -143,7 +143,7 @@
umount /localdisk > /dev/null 2>&1
mkdir -p /localdisk
-echo "Mounting $CL_ROOT on $SV_IPADDR:$SV_FIN_ROOT ..."
+echo "Mounting $CL_ROOT on $SV_IPADDR:$SV_FIN_ROOT..."
umount $CL_ROOT > /dev/null 2>&1
mount $SV_IPADDR:$SV_FIN_ROOT $CL_ROOT
@@ -195,13 +195,13 @@
echo "Current $c_dev was $spec at $mntpt"
dest=`echo "$CL_ROOT/$mntpt/" | sed 's,//*,/,g'`
- echo "Mounting (currrent) $c_dev on /localdisk ... "
+ echo "Mounting (currrent) $c_dev on /localdisk... "
mount -F ufs -o ro $c_dev /localdisk
- echo "Creating $dest ... "
+ echo "Creating $dest... "
mkdir -p $dest
- echo "Copying $c_dev ($mntpt) into $dest ... "
+ echo "Copying $c_dev ($mntpt) into $dest... "
(cd /localdisk && find . -depth -print | cpio -p -mdvP@ $dest)
#echo "(cd /localdisk && find . -depth -print | cpio -p -mdvP@ $dest)"
#rsync --archive --progress /localdisk/ $dest
@@ -229,7 +229,7 @@
config_vfstab() {
- echo "Configuring /etc/vfstab ..."
+ echo "Configuring /etc/vfstab..."
mkdir -p $CL_ROOT/$CL_SWAPFILE
@@ -271,7 +271,7 @@
config_autofs() {
if [ ! -z "$CL_EXPORT_HOME_MODE" ]; then
-# echo "Setting mode and ownership for $CL_NAME:/export/home..."
+ #echo "Setting mode and ownership for $CL_NAME:/export/home..."
echo "Setting mode and ownership for /export/home..."
if [ ! -d "$CL_ROOT/export/home" ]; then
mkdir -p $CL_ROOT/export/home
@@ -297,8 +297,8 @@
config_default_nfs
config_autofs
- # An allopathy
- mkdir -p $CL_ROOT/etc/skel/.gnome2/panel2.d/default/launchers
+ # An allopathy
+ mkdir -p $CL_ROOT/etc/skel/.gnome2/panel2.d/default/launchers
}
@@ -311,6 +311,6 @@
enum_local_disks ;;
esac
-echo "Unmounting $CL_ROOT ..."
+echo "Unmounting $CL_ROOT..."
umount $CL_ROOT
rmdir /localdisk
Index: dlkit2/sv.get-non-std-drivers
diff -u dlkit2/sv.get-non-std-drivers:1.1 dlkit2/sv.get-non-std-drivers:1.2
--- dlkit2/sv.get-non-std-drivers:1.1 Sun Feb 26 23:44:28 2006
+++ dlkit2/sv.get-non-std-drivers Fri Mar 3 09:52:54 2006
@@ -33,7 +33,7 @@
xlink $NAME.amd64 $NAME-$MAJ*/amd64/$NAME
}
-echo "Fetching archives from http://$MURAYAMA_URL/eng/ ..."
+echo "Fetching archives from http://$MURAYAMA_URL/eng/..."
$WGET -q -m -l 1 http://$MURAYAMA_URL/eng/
murayama_extract alta 1
murayama_extract bcf 0
Index: dlkit2/sv.mk-sv-dvddir.sh
diff -u dlkit2/sv.mk-sv-dvddir.sh:1.1 dlkit2/sv.mk-sv-dvddir.sh:1.2
--- dlkit2/sv.mk-sv-dvddir.sh:1.1 Mon Feb 27 23:13:30 2006
+++ dlkit2/sv.mk-sv-dvddir.sh Fri Mar 3 09:52:54 2006
@@ -33,14 +33,14 @@
SunOS)
DEVICE=`lofiadm -a $SV_DVDPATH`
mount -F hsfs -r $DEVICE $TMPDIR
- echon "copying whole DVD contents to $SV_DVDDIR ..."
+ echon "copying whole DVD contents to $SV_DVDDIR..."
copy_hier $TMPDIR $SV_DVDDIR
umount $TMPDIR
lofiadm -d $DEVICE
;;
Linux)
mount -o loop $SV_DVDPATH $TMPDIR
- echon "copying whole DVD contents to $SV_DVDDIR ..."
+ echon "copying whole DVD contents to $SV_DVDDIR..."
copy_hier $TMPDIR $SV_DVDDIR
umount $TMPDIR
;;
Index: dlkit2/sv.setup
diff -u dlkit2/sv.setup:1.13 dlkit2/sv.setup:1.14
--- dlkit2/sv.setup:1.13 Thu Mar 2 23:04:27 2006
+++ dlkit2/sv.setup Fri Mar 3 09:52:54 2006
@@ -522,12 +522,12 @@
prepare_postinstall_env() {
echo "Preparing post-installation environment..."
- echon "Copying /etc/* files to client... "
+ echon "Copying /etc/* files to client..."
cl_etc=$trandir/etc
rm -rf $cl_etc; mkdir $cl_etc
# /etc/.*
- echon "sysidtool "
+ echon " sysidtool"
touch $cl_etc/.UNCONFIGURED
touch $cl_etc/.NFS4inst_state.domain
cp cl.sysidtool $cl_etc/.sysIDtool.state
@@ -537,7 +537,7 @@
var=`echo "cl_etc_$f" | sed 's/\./_/g' | toupper`
eval "val=\$$var"
if [ -f "$val" ]; then
- echon "$f "
+ echon ", $f"
#backup_distfile $cl_etc/$f
cat $val /dev/null > $cl_etc/$f
fi
@@ -548,7 +548,7 @@
var=`echo "cl_etc_inet_$f" | sed 's/\./_/g' | toupper`
eval "val=\$$var"
if [ -f "$val" ]; then
- echon "inet/$f "
+ echon ", inet/$f"
mkdir -p $cl_etc/inet
#backup_distfile $cl_etc/inet/$f
cat $val /dev/null > $cl_etc/inet/$f
@@ -556,7 +556,7 @@
done
if [ "x$CL_ETC_INET_HOSTS" = "x*minimum*" ]; then
- echon "etc/hosts "
+ echon ", etc/hosts"
mkdir -p $cl_etc/inet
echo "127.0.0.1 localhost loghost" > $cl_etc/inet/hosts
echo "$SV_IPADDR $SV_NAME" >> $cl_etc/inet/hosts
@@ -564,14 +564,14 @@
# /etc/openwin/*
if [ -f "$CL_OWCONFIG" ]; then
- echon "openwin/server/etc/OWconfig "
+ echon ", openwin/server/etc/OWconfig"
mkdir -p $cl_etc/openwin/server/etc
cp "$CL_OWCONFIG" $cl_etc/openwin/server/etc/OWconfig
fi
# /etc/X11/*
if [ -f "$CL_XORGCONF" ]; then
- echon "X11/xorg.conf "
+ echon ", X11/xorg.conf"
mkdir -p $cl_etc/X11
cp "$CL_XORGCONF" $cl_etc/X11/xorg.conf
fi
@@ -580,7 +580,7 @@
if [ ! -z "$CL_HOSTID" ]; then
mkdir -p $cl_etc/rcS.d
set -- `dd bs=1 count=4 if="$CL_HOSTID" 2> /dev/null | od -t x4`
- echon " rcS.d/S05hostid[hostid=0x$2]"
+ echon ", rcS.d/S05hostid [hostid=0x$2]"
hostid10=`printf "%u" "0x$2"`
(echo 'test ! "x$1" = xstart && exit 0'
echo 'test ! -x /usr/bin/adb && exit 0'
@@ -593,7 +593,7 @@
fi
# /etc/rc2.d/*
- echon " rc2.d/S98xserver-check"
+ echon ", rc2.d/S98xserver-check"
mkdir -p $cl_etc/rc2.d
cp cl.s98xserver-check $cl_etc/rc2.d/S98xserver-check
chmod a+x $cl_etc/rc2.d/S98xserver-check
@@ -607,7 +607,7 @@
'*ldap*') echo 'ldap' > $trandir/nsswitch.templ ;;
esac
- echo " done"
+ echo "."
}
#----------------------------------------------------------------------
@@ -654,7 +654,7 @@
mkdir $tempdir/pnt
mkdir $SV_INSTROOT
- echon "Extracting original miniroot-image to $SV_INSTROOT ..."
+ echon "Extracting original miniroot-image to $SV_INSTROOT..."
gzip -dc $SV_DVDDIR/boot/x86.miniroot > $tempdir/miniroot.extd
case "$OSTYPE" in
SunOS)
@@ -705,7 +705,7 @@
;;
esac
- echo "Creating $SV_PXEBOOTDIR/$BOOT_ARCHIVE_FILE ..."
+ echo "Creating $SV_PXEBOOTDIR/$BOOT_ARCHIVE_FILE..."
${SUN_SCRIPT} ${ALT_ROOT}
rm -rf $tempdir
cp -pf ${ALT_ROOT}/${BOOT_ARCHIVE_SRC} $SV_PXEBOOTDIR/$BOOT_ARCHIVE_FILE