Ê×ÏȽéÉÜһϠdiff ºÍ patch¡£ÔÚÕâÀï²»»á°Ñ man ÔÚÏßÎĵµÉÏËùÓеÄÑ¡Ïî¶¼½éÉÜÒ»ÏÂ,ÄÇÑùҲû
ÓбØÒª¡£ÔÚ 99%µÄʱ¼äÀï,ÎÒÃÇÖ»»áÓõ½¼¸¸öÑ¡Ïî¡£ËùÒÔ±ØÐëѧ»áÕ⼸¸öÑ¡Ïî¡£
1¡¢diff
--------------------
NAME
diff - find differences between two files
SYNOPSIS
diff [options] from-file to-file
--------------------
¼òµ¥µÄ˵,diff µÄ¹¦ÄܾÍÊÇÓÃÀ´±È½ÏÁ½¸öÎļþµÄ²»Í¬,È»ºó¼Ç¼ÏÂÀ´,Ò²¾ÍÊÇËùνµÄ diff ²¹¶¡¡£Óï·¨
¸ñʽ:diff ¡¾Ñ¡Ïî¡¿ Ô´Îļþ(¼Ð) Ä¿µÄÎļþ(¼Ð),¾ÍÊÇÒª¸øÔ´Îļþ(¼Ð)´ò¸ö²¹¶¡,ʹ֮±ä³ÉÄ¿
µÄÎļþ(¼Ð),ÊõÓïÒ²¾ÍÊÇ“Éý¼¶”¡£ÏÂÃæ½éÉÜÈý¸ö×îΪ³£ÓÃÑ¡Ïî:
-r ÊÇÒ»¸öµÝ¹éÑ¡Ïî,ÉèÖÃÁËÕâ¸öÑ¡Ïî,diff »á½«Á½¸ö²»Í¬°æ±¾Ô´´úÂëĿ¼ÖеÄËùÓжÔÓ¦ÎļþÈ«²¿¶¼½ø
ÐÐÒ»´Î±È½Ï,°üÀ¨×ÓĿ¼Îļþ¡£
-N Ñ¡ÏîÈ·±£²¹¶¡Îļþ½«ÕýÈ·µØ´¦ÀíÒѾ´´½¨»òɾ³ýÎļþµÄÇé¿ö¡£
-u Ñ¡ÏîÒÔͳһ¸ñʽ´´½¨²¹¶¡Îļþ,ÕâÖÖ¸ñʽ±Èȱʡ¸ñʽ¸ü½ô´ÕЩ¡£
2¡¢patch
------------------
NAME
patch - apply a diff file to an original
SYNOPSIS
patch [options] [originalfile [patchfile]]
&nbs ......
bilbo ²âÊԳɹ¦£¬Linux×ÜËãÓа취¿ÉÒÔ·¢µã¶«Î÷ÁË£¡£¡£¡ÔÀ´ÔÚLinuxÏÂÊÇͨ¹ýFireFox·¢µÄ£¬µ«ÊÇCSDN¶ÔFirefoxµÄÖ§³ÖÓÐÎÊÌ⣬ÔÚÏ߱༻ᶪʧ¸ñʽ£¬¸üÑÏÖØµÄÊÇFireFoxÌá½»µÄÎÄÕÂÖ»ÄÜÓÃFireFox²ÅÄÜ¿´µ½£¬º¦µÃµ±Ê±ÎÒÒ»ÅúÎÄÕÂÈ«²¿ÖØÐ·¢±íÁËÒ»´Î£¬²»ÖªµÀÏÖÔÚºÃÁËûÓУ¬×ÜÖ®ÎÒÊÇûÓÐÔÙ¸ÒÓÃFireFox·¢±íÎÄÕÂÁË¡£×î½ü×ÜËãÔÚKDEÏÂÕÒµ½ÁËblog writerÁË£¡bilboËäÈ»²»ËãÌ«ºÃÓ㬷ÖÀàÈ¡²»»áÀ´£¬×î½üÎÄÕÂÈ¡²»»ØÀ´£¬²»ÄÜÉèÖÃÎÄÕ·¢±íµÄ·ÖÀ࣬»¹ÓÐÈçÏ´úÂë²»ºÃÌùµÄÎÊÌâ¡£¡£¡£¡£¡£¡£µ«ÊÇÆðÂ룬µ±ÎÒÏëͻȻ¿´µ½Ä³¸ö¶«Î÷Ïë×ªÔØµÄʱºò£¬²»ÓÃÔÙÇл»µ½WindowsÏÂÁË¡£bilboÊÇKDEϵÄÀëÏß²©¿Íд×÷¹¤¾ß£¬Ö÷Ò³ÊÇ£ºhttp://bilbo.gnufolks.org/ubuntu¿ÉÒÔÔÚÕâÀïÏÂÔØ£ºhttps://launchpad.net/~neversfelde/+archive/ppa/+packagesÌù´úÂë²âÊÔ£º#include <GL/glut.h>#include <stdlib.h>void display(void){/* clear all pixels */ glClear (GL_COLOR_BUFFER_BIT);/* draw white polygon (rectangle) with corners at * (0.25, 0.25, 0.0) and (0.75, 0.75, 0.0) */ glColor3f (1.0, 1.0, 1.0); glBegin(GL_POLYGON); glVertex3f (0.25, 0.25, 0.0); glVertex3f (0.75, 0.25, 0.0); glVertex3f (0.75, ......
1. °²×°squid·þÎñ
2. ÅäÖÃ/etc/squid/squid.confÎļþ
acl all src 0.0.0.0/0.0.0.0
http_access allow all
ÓÉÓÚÎÒÊÇÄÚÍøÊ¹Óã¬ËùÒÔȨÏÞÅäÖþÍÈ«¿ª·ÅÁË¡£
3. Æô¶¯squid·þÎñ£¬Ä¬ÈϵĶ˿ÚÊÇ3128
service squid restart ......
Linux System and Performance Monitoring(CPUƪ)
Date: 2009.07.21
Author: Darren Hoch
Òë: Tonnyom[AT]hotmail.com 2009.08.10
ǰÑÔ: ÍøÉÏÆäʵÓÐºÜ¶à¹ØÓÚÕâ·½ÃæµÄÎÄÕÂ,ÄÇΪʲô»¹»áÓÐ´ËÆªÄØ,ÓÐÕâô¼¸¸öÔÒò,ÊÇÎÒ·ÒëµÄ¶¯Á¦,µÚÒ»,¸ÅÄîºÍÄÚÈÝËäÈ»ÀÏÌ×,µ«¶¼½²µÃºÜ͸³¹,¶øÇÒ»¹ºÜÈ«Ãæ.µÚ¶þ,ÀíÂÛ½áºÏʵ¼Ê,ÆäÖа¸Àý·ÖÎö¶¼²»´í.µÚÈý,²»»¨ÉÚ,²ÉÓõŤ¾ß¼°ÃüÁî¶¼ÊÇ×î»ù±¾µÄ,ÓÐÖúÓÚʵ¼Ê²Ù×÷.µ«±¾È˲ÅÊèѧdz,ÒëÎÄ´ó¶àÊý¶¼ÊÇÁ¢×ãÓÚ×Ô¼º¶ÔÔÎĵÄÀí½â,´ó¼ÒÒ²¿ÉÒÔ×Ô¼ºÈ¥OSCANÉÏÕÒÔÎÄ,Èç¹ûÓÐʲô½Ï´ó³öÈë,»¹ÍûÁôÑԻظ´,ÉõÊǸм¤!
1.0 ÐÔÄÜ¼à¿Ø½éÉÜ
ÐÔÄÜÓÅ»¯¾ÍÊÇÕÒµ½ÏµÍ³´¦ÀíÖÐµÄÆ¿¾±ÒÔ¼°È¥³ýÕâЩµÄ¹ý³Ì,¶àÊý¹ÜÀíÔ±ÏàÐÅ¿´Ò»Ð©Ïà¹ØµÄ”cook book”¾Í¿ÉÒÔʵÏÖÐÔÄÜÓÅ»¯,ͨ³£Í¨¹ý¶ÔÄں˵ÄһЩÅäÖÃÊÇ¿ÉÒÔ¼òµ¥µÄ½â¾öÎÊÌâ,µ«²¢²»ÊʺÏÿ¸ö»·¾³,ÐÔÄÜÓÅ»¯ÆäʵÊǶÔOS ¸÷×Óϵͳ´ïµ½Ò»ÖÖÆ½ºâµÄ¶¨Òå,ÕâЩ×Óϵͳ°üÀ¨ÁË:
CPU
Memory
IO
Network
ÕâЩ×Óϵͳ֮¼ä¹ØÏµÊÇÏ໥±Ë´ËÒÀÀµµÄ,ÈκÎÒ»¸ö¸ß¸ºÔض¼»áµ¼ÖÂÆäËû×Óϵͳ³öÏÖÎÊÌâ.±ÈÈç:
´óÁ¿µÄÒ ......
ÎÒʹÓõÄÐéÄâ»úÊÇVMware£¬ÔÚÆäÉÏ×°µÄϵͳÊÇRed Hat Linux 9.0¡£ÔÚLinuxÉÏʹÓÃUÅÌÓëWindowsÏÂÓÐËùÇø±ð£¬ÐèÒªÏȹÒÔØ£¬µ±³ÉÎļþ·ÃÎÊ£¬ºó²ÅÄÜʹÓ㨲»¹ýÔÚUbuntuϺÃÏñ²»ÓùÒÔØ¾Í¿ÉÒÔÖ±½ÓʹÓã©¡£
Èç¹ûÏëÔÚÐéÄâ»úÉÏʹÓÃUÅÌ£¬ÓÐÒ»µãÐèҪעÒâµÄÊÇ£¬±ØÐë°ÑÐéÄâ´ò¿ª²¢ÇÒ²»ÄÜ´°¿Ú×îС»¯¡£·ñÔò£¬UÅ̻ᱻÊDZðµ½WindowsÏ£¬¶ø²»ÊÇÐéÄâ»úÖС£
ÔÚµ±Ç°´°¿ÚÊÇÐéÄâ»úµÄǰÌáÏ£¬²åÈëUÅÌ£¬±»Linuxϵͳʶ±ðºó£¬ÒªÊ¹ÓÃmountÃüÁî¹ÒÔØ¡£Ê×ÏÈÓ¦²é¿´UÅ̵IJåÈëÇé¿ö£¬Ê¹ÓÃÃüÁîfdisk –l È·¶¨UÅÌÉ豸Îļþ£¬¼ÙÉèUÅ̵ÄÉ豸ÃûΪsdc1¡£ÎÒÃÇÏë°ÑËû¹ÒÔØµ½/mnt/usbÏ¡£ÏÈÓÃÃüÁÁ¢Îļþ¼Ðmkdir /mnt/usb£¬ÔÚͼÐÎÒ³Ãæ¾Í»á¿´µ½ÔÚ/mntĿ¼ÏÂÓиöusbÎļþ¼Ð£¬Ò²¿ÉÒÔÔÚÖÕ¶ËÏÈcd /mnt£¬½øÈëmntĿ¼£¬ÔÚls²é¿´Îļþ¼Ð¡£ÓÐÁËÄ¿±êÎļþ¼Ð£¬Ö»ÐèÔÚÖÕ¶ËÊäÈëmount /dev/sdc1 /mnt/usb ¼´ÊµÏÖÁ˹ÒÔØUÅÌ£¬Ö®ºó·ÃÎÊ/mnt/usbĿ¼£¬¾Í¿ÉÒÔ¶ÔUÉϵÄÎļþ½øÐжÁдÁË¡£ÔÚʹÓÃÍê±Ïºó£¬Ò²ÐèÒª½øÐÐÐ¶ÔØ£¬ÇÃÈëÃüÁîumount /dev/sdc1 /mnt/usb¼´Íê³ÉÁËUÅ̵ÄÐ¶ÔØ£¬¿ÉÒÔ°ÎÏÂUÅÌÁË¡£ ......
ÔÚlinuxºÍunix»·¾³ÖУ¬Ô´Âë°²×°ÊÇ×î³£ÓõÄÈí¼þ°²×°·½Ê½£¬Ò»Ð©Èí¼þ³ýÁËÌṩԴÂëÍ⣬ҲÌṩ¸÷ÖÖ·¢ÐаæµÄ¶þ½øÖư²×°°ü£¨Èç»ùÓÚredhat°ü¹ÜÀí¹¤¾ßµÄrpm°ü£©£¬µ«Ç¿ÁÒ½¨ÒéʹÓÃÔ´Âë°²×°·½Ê½¡£ÔÒòÊÇ£º£¨1£©Ã»ÓÐÀàËÆrpmÄÇÑùÈÃÈËÄÕ»ðµÄ°üÒÀÀµ¹ØÏµ£¬£¨2£©Ô´Âë°²×°Áé»î×ÔÓÉ£¬ÊÊÓÃÓÚ²»Í¬µÄƽ̨£¬Î¬»¤Ò²Ê®·Ö·½±ã¡£
Ô´ÂëµÄ°²×°Ò»°ãÓÉ3¸ö²½Öè×é³É£ºÅäÖã¨configure£©¡¢±àÒ루make£©¡¢°²×°£¨make install£©£¬¾ßÌåµÄ°²×°·½·¨Ò»°ã×÷Õß¶¼»á¸ø³öÎĵµ£¬ÕâÀïÖ÷ÒªÌÖÂÛÅäÖã¨configure£©¡£ConfigureÊÇÒ»¸ö¿ÉÖ´Ðнű¾£¬ËüÓкܶàÑ¡ÏʹÓÃÃüÁî./configure –helpÊä³öÏêϸµÄÑ¡ÏîÁÐ±í£¬ÈçÏ£º
-bash-3.00# ./configure --help
Usage: configure [options] [host]
Options: [defaults in brackets after descriptions]
Configuration:
--cache-file=FILE cache test results in FILE
--help print this message
--no-create ......