diff & merge fixed (dirty hack to treat symlinks right)
"elinks" is purged by "harden"
This commit is contained in:
parent
831849b93f
commit
6567e82970
|
@ -14,7 +14,7 @@ set -eu
|
||||||
RUNTIMEDIR=/opt/dfsruntime/runtimerd
|
RUNTIMEDIR=/opt/dfsruntime/runtimerd
|
||||||
TUNDEV=$RUNTIMEDIR/dev/net/tun
|
TUNDEV=$RUNTIMEDIR/dev/net/tun
|
||||||
|
|
||||||
SECURITY_REMOVE_PACKAGES="ssh strace telnet unzip tar zip wget ppp pppconfig nvi nano gzip curl bzip2 aptitude tasksel pppoe pppoeconf"
|
SECURITY_REMOVE_PACKAGES="ssh strace telnet unzip tar zip wget ppp pppconfig nvi nano gzip curl bzip2 aptitude tasksel pppoe pppoeconf elinks"
|
||||||
|
|
||||||
|
|
||||||
function configure_normal()
|
function configure_normal()
|
||||||
|
|
|
@ -49,7 +49,9 @@ case "$ACTION" in
|
||||||
# ignore generated reports
|
# ignore generated reports
|
||||||
# ignore cryptobox.pl and index.html, as those are the same as
|
# ignore cryptobox.pl and index.html, as those are the same as
|
||||||
# /var/www/cryptobox (symbilic links)
|
# /var/www/cryptobox (symbilic links)
|
||||||
diff -ruN --exclude=report --exclude=cryptobox.pl --exclude=index.html "`basename \"$MIRROR_ORIG_DIR\"`" "`basename \"$MIRROR_DIR\"`" | grep -v "^Binary files"
|
# replace the link name (/var/www/cryptobox) by its destination
|
||||||
|
# UGLY!
|
||||||
|
diff -ruN --exclude=report --exclude=cryptobox.pl --exclude=index.html "`basename \"$MIRROR_ORIG_DIR\"`" "`basename \"$MIRROR_DIR\"`" | grep -v "^Binary files" | sed 's#/var/www/cryptobox\t#/var/www/cgi-bin/cryptobox.pl\t#'
|
||||||
;;
|
;;
|
||||||
stop )
|
stop )
|
||||||
/etc/init.d/ssh stop
|
/etc/init.d/ssh stop
|
||||||
|
|
Loading…
Reference in New Issue