Skip to content
Browse files

Use dhclient hooks instead of proprietary pump hooks for dhcphostname

  • Loading branch information...
1 parent efc764b commit 8147fe1009e24e218bf20b9f6c1b94fd9465ffda @mrud mrud committed Dec 6, 2010
View
3 debian/rules
@@ -30,7 +30,7 @@ install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs etc/grml etc/init.d usr/sbin usr/bin usr/share/doc/grml-saveconfig usr/lib/grml-autoconfig
+ dh_installdirs etc/grml etc/dhcp{3,}/dhclient-exit-hooks.d etc/init.d usr/sbin usr/bin usr/share/doc/grml-saveconfig
# Add here commands to install the package into debian/grml-autoconfig.
install -m 755 grml-autoconfig debian/grml-autoconfig/etc/init.d/grml-autoconfig
@@ -43,7 +43,6 @@ install: build
install -m 755 bin/restore-config debian/grml-autoconfig/usr/bin/restore-config
install -m 755 bin/save-config debian/grml-autoconfig/usr/bin/save-config
- install -m 755 lib/pump-runparts debian/grml-autoconfig/usr/lib/grml-autoconfig/pump-runparts
# just as a "backup" solution:
cp -a etc/* debian/grml-autoconfig/etc/
View
1 etc/dhcp/dhclient-exit-hooks.d/grml-sethostname
View
12 etc/dhcp3/dhclient-exit-hooks.d/grml-sethostname
@@ -0,0 +1,12 @@
+# only run the comamnd if we bound to a new ip
+case "$reason" in BOUND)
+if ! grep -q 'nodhcphostname' /proc/cmdline && [ -f /etc/grml_cd ] ; then
+
+ hostname=$(busybox nslookup "$new_ip_address" | awk '/Address 1: '$new_ip_address'/ {print $4}')
+ if [ -n "$hostname" ] ; then
+ grml-hostname "$hostname"
+ hostname -F /etc/hostname
+ fi
+fi
+;;
+esac
View
21 etc/grml/pump-scripts.d/set-hostname
@@ -1,21 +0,0 @@
-#!/bin/zsh -e
-# PUMP Script
-# $1 Calling circumstance (up, renewal, down)
-# $2 interface
-# $3 ip
-
-# Exit early, if we're not being called for the initial lease
-[ "$1" != "up" ] && exit 0
-
-. /etc/grml/autoconfig.functions
-
-# only run if no nodhcphostname parameter is given
-# and if running in live mode
-if ! checkbootparam 'nodhcphostname' && [ -f /etc/grml_cd ] ; then
-
- hostname=$(busybox nslookup "$3" | awk '/Address 1: '$3'/ {print $4}')
- [ -n "$hostname" ] || exit 1
-
- grml-hostname "$hostname"
- hostname -F /etc/hostname
-fi
View
9 lib/pump-runparts
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-arguments=""
-
-for ARG in $* ; do
- arguments="${arguments} -a ${ARG} "
-done
-
-run-parts $arguments /etc/grml/pump-scripts.d/

0 comments on commit 8147fe1

Please sign in to comment.
Something went wrong with that request. Please try again.