diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/naskpass.initconf | 10 | ||||
| -rwxr-xr-x | scripts/naskpass.pre | 27 |
2 files changed, 1 insertions, 36 deletions
diff --git a/scripts/naskpass.initconf b/scripts/naskpass.initconf index 63989a1..fa1f945 100755 --- a/scripts/naskpass.initconf +++ b/scripts/naskpass.initconf @@ -1,15 +1,5 @@ # initramfs naskpass config file -# maximum ip wait time in seconds -MAXWAIT=25 - # kernel printk path PRINTK=/proc/sys/kernel/printk OLDPRINTK=/tmp/naskpass.oldprintk - -# network options -# NASK_IP, NASK_MAC requires NASK_DEV ! -#NASK_DEV=eth0 -# commenting out the following line will force debian's `configure_network` routine -#NASK_IP=192.168.0.11 -#NASK_MAC=66:66:66:66:66:66 diff --git a/scripts/naskpass.pre b/scripts/naskpass.pre index 8b3ab0e..4eb6d3b 100755 --- a/scripts/naskpass.pre +++ b/scripts/naskpass.pre @@ -8,33 +8,8 @@ if [ "x${PRINTK}" != "x" ] && [ -r ${PRINTK} ] && [ -w ${PRINTK} ]; then cat ${PRINTK} >${OLDPRINTK} echo "0 0 0 0" >${PRINTK} fi -sleep 0.2 - -echo -n 'waiting for ip ' -CURWAIT=$MAXWAIT if [ -x /sbin/sshd ]; then - -if [ "x${NASK_DEV}" != "x" ] && [ "x${NASK_MAC}" != "x" ]; then - ifconfig ${NASK_DEV} hw ether ${NASK_MAC} -fi - -if [ "x${NASK_DEV}" != "x" ] && [ "x${NASK_IP}" != "x" ]; then - ifconfig ${NASK_DEV} ${NASK_IP} -else - [ -x /bin/ipconfig ] && configure_networking & -fi - -while ! $(ifconfig -a | grep -qoE 'inet addr:'); do - echo -n '.' - if [ $CURWAIT -le 0 ]; then - echo ' got no ip, continue anyway.' - break - fi - CURWAIT=$(expr $CURWAIT - 1) - sleep 0.5 -done -echo +[ -x /bin/ipconfig ] && configure_networking >/dev/null 2>/dev/null & /sbin/sshd fi - |