テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

空白の変更を非表示

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

テキストスタイル

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 11 年前差分は期限切れになりません

5 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

78 行

18 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

85 行

#!/bin/sh

PATH=/sbin:/bin:/usr/sbin:/usr/bin

PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin

# for a chrooted server: "-u bind -t /var/lib/named"

# Don't modify this line, change or create /etc/default/bind9.

OPTIONS=""

PID_FILE=/var/run/bind/run/named.pid

BACKUP_PID=/var/run/named/named.pid

case "$1" in

start)

echo -n "Starting domain name service: named"

modprobe capability >/dev/null 2>&1 || true

# dirs under /var/run can go away on reboots.

mkdir -p /var/run/bind/run

chmod 775 /var/run/bind/run

chown root:bind /var/run/bind/run >/dev/null 2>&1 || true

if [ ! -x /usr/sbin/named ]; then

if [ ! -x /usr/local/sbin/named ]; then

echo "named binary missing - not starting"

exit 1

if start-stop-daemon --start --quiet --exec /usr/sbin/named \

if start-stop-daemon --start --quiet --exec /usr/local/sbin/named \

--pidfile $PID_FILE -- $OPTIONS; then

if [ -x /sbin/resolvconf ] ; then

echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo

echo "."

;;

stop)

echo -n "Stopping domain name service: named"

#if [ -x /sbin/resolvconf ]; then

# /sbin/resolvconf -d lo

#fi

#/usr/sbin/rndc stop

#/usr/local/sbin/rndc stop

PF=$PID_FILE

if [ ! -s "$PF" ]; then

PF=$BACKUP_PID;

if [ ! -s "$PF" ]; then

echo "Cannot find $PID_FILE or $BACKUP_PID. Unable to stop named";

exit 10;

kill `cat $PF`

echo "."

;;

reload)

#/usr/sbin/rndc reload

#/usr/local/sbin/rndc reload

PF=$PID_FILE

#kill -HUP `cat $PID_FILE`

if [ ! -s "$PF" ]; then

PF=$PID_FILE

PF=$BACKUP_PID;

if [ ! -s "$PF" ]; then

PF=$BACKUP_PID;

kill -HUP `cat $PF`

if [ ! -s "$PF" ]; then

echo "Cannot find $PID_FILE or $BACKUP_PID. Unable to stop named";

exit 10;

kill -HUP `cat $PF`

echo "."

;;

restart|force-reload)

$0 stop

sleep 2

$0 start

;;

echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2

exit 1

;;

esac

exit 0

保存された差分

原文

ファイルを開く

#!/bin/sh

PATH=/sbin:/bin:/usr/sbin:/usr/bin

# for a chrooted server: "-u bind -t /var/lib/named"
# Don't modify this line, change or create /etc/default/bind9.
OPTIONS=""

PID_FILE=/var/run/bind/run/named.pid
BACKUP_PID=/var/run/named/named.pid

case "$1" in
    start)
	echo -n "Starting domain name service: named"

modprobe capability >/dev/null 2>&1 || true

# dirs under /var/run can go away on reboots.
	mkdir -p /var/run/bind/run
	chmod 775 /var/run/bind/run
	chown root:bind /var/run/bind/run >/dev/null 2>&1 || true

if [ ! -x /usr/sbin/named ]; then
	    echo "named binary missing - not starting"
	    exit 1
	fi
	if start-stop-daemon --start --quiet --exec /usr/sbin/named \
		--pidfile $PID_FILE -- $OPTIONS; then
	    if [ -x /sbin/resolvconf ] ; then
		echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
	    fi
	fi
	echo "."	
    ;;

stop)
	echo -n "Stopping domain name service: named"
	#if [ -x /sbin/resolvconf ]; then
	#    /sbin/resolvconf -d lo
	#fi
	#/usr/sbin/rndc stop
	PF=$PID_FILE
	if [ ! -s "$PF" ]; then
		PF=$BACKUP_PID;
	fi

if [ ! -s "$PF" ]; then
		echo "Cannot find $PID_FILE or $BACKUP_PID. Unable to stop named";
		exit 10;
	fi

kill `cat $PF`
	echo "."	
    ;;

reload)
	#/usr/sbin/rndc reload
	PF=$PID_FILE
	if [ ! -s "$PF" ]; then
		PF=$BACKUP_PID;
        fi
	kill -HUP `cat $PF`
    ;;

restart|force-reload)
	$0 stop
	sleep 2
	$0 start
    ;;
    
    *)
	echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
	exit 1
    ;;
esac

exit 0

変更されたテキスト

ファイルを開く

#!/bin/sh

PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin

# for a chrooted server: "-u bind -t /var/lib/named"
# Don't modify this line, change or create /etc/default/bind9.
OPTIONS=""

PID_FILE=/var/run/bind/run/named.pid
BACKUP_PID=/var/run/named/named.pid

case "$1" in
    start)
	echo -n "Starting domain name service: named"

modprobe capability >/dev/null 2>&1 || true

# dirs under /var/run can go away on reboots.
	mkdir -p /var/run/bind/run
	chmod 775 /var/run/bind/run
	chown root:bind /var/run/bind/run >/dev/null 2>&1 || true

if [ ! -x /usr/local/sbin/named ]; then
	    echo "named binary missing - not starting"
	    exit 1
	fi
	if start-stop-daemon --start --quiet --exec /usr/local/sbin/named \
		--pidfile $PID_FILE -- $OPTIONS; then
	    if [ -x /sbin/resolvconf ] ; then
		echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
	    fi
	fi
	echo "."	
    ;;

stop)
	echo -n "Stopping domain name service: named"
	#if [ -x /sbin/resolvconf ]; then
	#    /sbin/resolvconf -d lo
	#fi
	#/usr/local/sbin/rndc stop
	PF=$PID_FILE
	if [ ! -s "$PF" ]; then
		PF=$BACKUP_PID;
	fi

if [ ! -s "$PF" ]; then
		echo "Cannot find $PID_FILE or $BACKUP_PID. Unable to stop named";
		exit 10;
	fi

kill `cat $PF`
	echo "."	
    ;;

reload)
	#/usr/local/sbin/rndc reload
	#kill -HUP `cat $PID_FILE`
        PF=$PID_FILE
        if [ ! -s "$PF" ]; then
                PF=$BACKUP_PID;
        fi

if [ ! -s "$PF" ]; then
                echo "Cannot find $PID_FILE or $BACKUP_PID. Unable to stop named";
                exit 10;
        fi

kill -HUP `cat $PF`
	echo "."
    ;;

restart|force-reload)
	$0 stop
	sleep 2
	$0 start
    ;;
    
    *)
	echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
	exit 1
    ;;
esac

exit 0