[Fai-commit] r2997 - in trunk: . debian lib scripts

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-04 12:47:10 +0000 (Fri, 04 Nov 2005)
New Revision: 2997

Added:
   trunk/lib/dhclient-perl
Removed:
   trunk/scripts/dhclient-perl
Modified:
   trunk/Makefile
   trunk/debian/fai-nfsroot.install
   trunk/scripts/dhclient-script
Log:
move dhclient-perl from scripts to lib, install it into usr/lib/fai
and add it to fai-nfsroot


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-11-04 09:04:39 UTC (rev 2996)
+++ trunk/Makefile	2005-11-04 12:47:10 UTC (rev 2997)
@@ -3,7 +3,7 @@
 DESTDIR=$(shell pwd)/debian/tmp
 export DOCDIR = $(shell pwd)/debian/fai-doc/usr/share/doc/fai-doc
 LIBDIR = $(DESTDIR)/usr/lib/fai
-USRSBIN_SCRIPTS = make-fai-nfsroot make-fai-bootfloppy fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai setup_harddisks faireboot dhclient-perl
+USRSBIN_SCRIPTS = make-fai-nfsroot make-fai-bootfloppy fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai setup_harddisks faireboot
 
 USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub
 libfiles=$(wildcard lib/[a-z]*)  # do not include CVS dir

Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install	2005-11-04 09:04:39 UTC (rev 2996)
+++ trunk/debian/fai-nfsroot.install	2005-11-04 12:47:10 UTC (rev 2997)
@@ -1,4 +1,5 @@
 usr/sbin/faireboot
+usr/lib/fai/dhclient-perl
 usr/lib/fai/create_ramdisk
 usr/lib/fai/create_resolv_conf
 usr/lib/fai/load_keymap_consolechars

Copied: trunk/lib/dhclient-perl (from rev 2990, trunk/scripts/dhclient-perl)

Deleted: trunk/scripts/dhclient-perl
===================================================================
--- trunk/scripts/dhclient-perl	2005-11-04 09:04:39 UTC (rev 2996)
+++ trunk/scripts/dhclient-perl	2005-11-04 12:47:10 UTC (rev 2997)
@@ -1,82 +0,0 @@
-#! /usr/bin/perl
-
-# $Id$
-#*********************************************************************
-#
-# dhclient-perl -- perl script that prints out DHCP data
-#
-# This script is part of FAI (Fully Automatic Installation)
-# Copyright (c) 2000-2003 by Thomas Lange, Universitaet zu Koeln
-#
-#*********************************************************************
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
-#*********************************************************************
-
-# TODO: extract search info from DOMAIN
-
-# map dhcp names to bootp names
-%names = qw/
-  ip_address              IPADDR
-  host_name               HOSTNAME
-  network_number          NETWORK
-  subnet_mask             NETMASK
-  broadcast_address       BROADCAST
-  routers                 GATEWAYS
-  domain_name             DOMAIN
-  domain_name_servers     DNSSRVS
-  server_name             SERVER
-  time_servers            TIMESRVS
-  ntp_servers             NTPSRVS
-  nis_domain              YPDOMAIN
-  nis_servers             YPSRVR
-  fai_location            FAI_LOCATION
-  fai_action              FAI_ACTION
-  fai_flags               FAI_FLAGS
-  option_170              FAI_LOCATION
-  option_171              FAI_ACTION
-  option_172              FAI_FLAGS
-  option_173              reserved173
-  option_174              reserved174
-  option_175              reserved175
-/;
-
-# these lists should also be listed as single items
- at list = qw/domain_name_servers routers time_servers ntp_servers nis_servers/;
-%listitem = map { $_ => 1 } @list;
-
-# use short host name
-$ENV{new_host_name} = (split '\.',$ENV{new_host_name})[0];
-
-foreach $name (sort keys %names) {
-  $dhcpname="new_$name";
-  if ($ENV{$dhcpname}) {
-    print "$names{$name}='$ENV{$dhcpname}'\n";
-    items($name) if $listitem{$name};
-  }
-}
-
-exit 0;
-
-
-# - - - - - - - - - - - - - - - - - - - - -
-sub items {
-  my $key = shift;
-  my $i = 1;
-    foreach (split /\s+/,$ENV{"new_$key"}){
-      print "$names{$key}_$i='$_'\n";
-      $i++;
-    }
-}

Modified: trunk/scripts/dhclient-script
===================================================================
--- trunk/scripts/dhclient-script	2005-11-04 09:04:39 UTC (rev 2996)
+++ trunk/scripts/dhclient-script	2005-11-04 12:47:10 UTC (rev 2997)
@@ -2,4 +2,4 @@
 
 # execute perl script to obtain dhcp data
 
-perl /usr/bin/dhclient-perl
+perl /usr/lib/fai/dhclient-perl