Changeset 34 for devel/dploy-dhcp

Timestamp:

01/24/08 20:05:59 (4 years ago)

Author:

bruno

Message:

first working packages for common and dhcp.
dhcp needs more work to handle correctly subnet, which was not considered up to now

Location:

devel/dploy-dhcp

Files:

• bin/dploy-add2dhcp (modified) (2 diffs)
• install.sh (modified) (2 diffs)

devel/dploy-dhcp/bin/dploy-add2dhcp

@@ -20 +20 @@
 #
 
-my $mac=$ARGV[0];
+my $mac=$ARGV[0] || "";
 
 if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
@@ -30 +30 @@
 $mac =~ tr/A-Z/a-z/;
 
-my $ip=$ARGV[1];
+my $ip=$ARGV[1] || "";
 
 if ($ip !~ /^([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/) {

devel/dploy-dhcp/install.sh

@@ -6 +6 @@
 if [ "_$PREFIX" != "_" ]; then
     local=${DESTDIR}$PREFIX
+    conf=$CONFDIR
 else
     local=/usr/local
         echo $PATH | grep $local/bin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add $local/bin to your PATH."
+    conf=$local/$CONFDIR
 fi
 
@@ -14 +16 @@
 mkdir -p $local/bin
 install -m 0755 bin/dploy-add2dhcp $local/bin 
+
+# The script need to know where the CONFDIR is
+perl -pi -e "s|PBCONF|$conf|" $local/bin/dploy-add2dhcp