[dl-x86solaris-devel 38] CVS update: dlkit2

Zurück zum Archiv-Index

SAWADA Keiji card_capto****@users*****
2006年 2月 26日 (日) 15:35:38 JST


Index: dlkit2/cl.diskless-bootrc
diff -u dlkit2/cl.diskless-bootrc:1.1.1.1 dlkit2/cl.diskless-bootrc:removed
--- dlkit2/cl.diskless-bootrc:1.1.1.1	Fri Feb 24 01:15:29 2006
+++ dlkit2/cl.diskless-bootrc	Sun Feb 26 15:35:38 2006
@@ -1,36 +0,0 @@
-
-echo '
- =     =
- =  =  =  ======  =        ====    ====   =    =  ======      =====   ====
- =  =  =  =       =       =    =  =    =  ==  ==  =             =    =    =
- =  =  =  =====   =       =       =    =  = == =  =====         =    =    =
- =  =  =  =       =       =       =    =  =    =  =             =    =    =
- =  =  =  =       =       =    =  =    =  =    =  =             =    =    =
-  == ==   ======  ======   ====    ====   =    =  ======        =     ====
-
-           #####
-          #     #   ####   #         ##    #####      #     ####
-          #        #    #  #        #  #   #    #     #    #
-           #####   #    #  #       #    #  #    #     #     ####
-                #  #    #  #       ######  #####      #         #
-          #     #  #    #  #       #    #  #   #      #    #    #
-           #####    ####   ######  #    #  #    #     #     ####
-'
-
-echo "<< Boot Parameters >>"
-
-getprop boot-path bootpath
-echo "boot-path:	${bootpath}"
-
-getprop boot-args oldargs
-echo "boot-args(old):	${oldargs}"
-
-echo "boot-args(new):	${bootargs}"
-setprop boot-args "$bootargs"
-
-set bootfile "kernel/unix"
-echo "boot-file:	${bootfile}"
-
-echo ""
-echo "<< Starting Solaris Kernel >>"
-run $bootfile
Index: dlkit2/sv.setup
diff -u dlkit2/sv.setup:1.6 dlkit2/sv.setup:1.7
--- dlkit2/sv.setup:1.6	Sun Feb 26 15:27:35 2006
+++ dlkit2/sv.setup	Sun Feb 26 15:35:38 2006
@@ -473,25 +473,19 @@
     echon ", boot scripts"
     # boot script and install script for install session
     backup_distfile $SV_INSTROOT/sbin/install-setup
-    backup_distfile $SV_INSTROOT/etc/bootrc
     cp /dev/null $SV_INSTROOT/boot/solaris/bootargs.rc
 
     case "$INSTALL_TYPE" in
 	disklessify)
-	    (echo "set bootargs '-svr'"
-		cat cl.diskless-bootrc ) > $SV_INSTROOT/etc/bootrc
 	    cp -p cl.install-setup-disklessify $SV_INSTROOT/sbin/install-setup
 	    ;;
 
 	netinstall)
-	    cp $SV_INSTROOT/etc/bootrc.dist $SV_INSTROOT/etc/bootrc
 	    cp -p $SV_INSTROOT/sbin/install-setup.dist \
 		$SV_INSTROOT/sbin/install-setup
 	    ;;
 
 	diskless)
-#	    (echo "set bootargs '-v - nowin'"
-#		cat cl.diskless-bootrc) > $SV_INSTROOT/etc/bootrc
 	    cp -p cl.install-setup-diskless $SV_INSTROOT/sbin/install-setup
 	    ;;
 
@@ -499,11 +493,6 @@
 	    ;;
     esac
 
-    # use /etc/bootrc if user supplies it
-    if [ ! -z "$CL_INST_BOOTRC" ]; then
-	cp "$CL_INST_BOOTRC" $SV_INSTROOT/etc/bootrc
-    fi
-
     echo '.'
 }
 


dl-x86solaris-devel メーリングリストの案内
Zurück zum Archiv-Index