[Fai-commit] r2941 - in trunk: . doc lib scripts
fai-repository at svn.debian.org
fai-repository at svn.debian.org
Thu Oct 13 13:48:32 UTC 2005
Author: lange
Date: 2005-10-13 13:48:30 +0000 (Thu, 13 Oct 2005)
New Revision: 2941
Added:
trunk/scripts/device2grub
trunk/scripts/start-stop-daemon
Removed:
trunk/lib/device2grub
trunk/scripts/fai-start-stop-daemon
Modified:
trunk/Makefile
trunk/NEWS
trunk/doc/Makefile
Log:
changes for additional binary packages
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-10-13 13:47:44 UTC (rev 2940)
+++ trunk/Makefile 2005-10-13 13:48:30 UTC (rev 2941)
@@ -1,12 +1,11 @@
include VERSION
DESTDIR=$(shell pwd)/debian/tmp
-DEB_HOST_ARCH=$(MACHTYPE)
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 fai-start-stop-daemon dhclient-perl dhclient-script
+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
-USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf
+USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub
CONFFILES=
ADEXAMPLE=$(DOCDIR)/examples/advanced
SIEXAMPLE=$(DOCDIR)/examples/simple
@@ -26,15 +25,18 @@
$(MAKE) -f debian/rules clean
install:
- mkdir -p $(DESTDIR)/man $(DESTDIR)/etc/fai $(DESTDIR)/etc/modutils
+ mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{fai,modutils,dhcp3,apt.conf.d}
mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai
install man/* $(DESTDIR)/man
$(MAKE) -C doc install
- -install -m755 $(libfiles) $(LIBDIR)
+ -install $(libfiles) $(LIBDIR)
cd scripts ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
cd scripts ; install $(USRBIN_SCRIPTS) $(DESTDIR)/usr/bin
+ install scripts/start-stop-daemon $(DESTDIR)/sbin
+ install scripts/dhclient-script $(DESTDIR)/etc/dhcp3
+ install -m644 conf/dhclient.conf $(DESTDIR)/etc/dhcp3
# install -m644 share/Fai.pm $(DESTDIR)/usr/share/perl5/Debian
- install -m644 conf/apt.conf conf/dhclient.conf $(DESTDIR)/etc/fai/
+ install -m644 conf/apt.conf $(DESTDIR)/etc/apt.conf.d/90fai
install -m644 conf/fai.conf conf/sources.list conf/menu.lst $(DESTDIR)/etc/fai/
install -m600 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/
install -m600 conf/fai_modules_off $(DESTDIR)/etc/modutils
@@ -46,5 +48,4 @@
cd $(DOCDIR)/examples/advanced/scripts ; mv DEFAULT1 DEFAULT
cd $(DOCDIR)/examples/simple/scripts ; mv LAST1 LAST
-
.PHONY: clean veryclean
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2005-10-13 13:47:44 UTC (rev 2940)
+++ trunk/NEWS 2005-10-13 13:48:30 UTC (rev 2941)
@@ -1,3 +1,8 @@
+New in FAI 2.9
+
+ - splitting the FAI package into more packages:
+ fai-server, fai-client, fai-nfsroot, fai-doc, fai-quickstart
+
New in FAI 2.8.4
- small but important bug fix: remove non-US entry
Modified: trunk/doc/Makefile
===================================================================
--- trunk/doc/Makefile 2005-10-13 13:47:44 UTC (rev 2940)
+++ trunk/doc/Makefile 2005-10-13 13:48:30 UTC (rev 2941)
@@ -1,6 +1,6 @@
docname = fai-guide
fdocname = $(docname).sgml
-MISC_DOC = FAQ QUESTIONNAIRE classes_description.txt links.html changelog.old README*
+MISC_DOC = classes_description.txt links.html changelog.old
%.html: %.sgml
debiandoc2html $<
Deleted: trunk/lib/device2grub
===================================================================
--- trunk/lib/device2grub 2005-10-13 13:47:44 UTC (rev 2940)
+++ trunk/lib/device2grub 2005-10-13 13:48:30 UTC (rev 2941)
@@ -1,35 +0,0 @@
-#! /usr/bin/perl
-# copyright Thomas Lange 2001, lange at debian.org
-# map "normal" device notation to grub notation
-
-# TODO: read from stdin if no parameter given
-
-use strict;
-my $grubdevice;
-my %map;
-
-my $device=shift;
-my $devicemap="$ENV{target}/boot/grub/device.map";
-
-open (DEVICEMAP,"<$devicemap") || die "Can't open $devicemap\n";
-while (<DEVICEMAP>) {
- my ($grubdevice,$olddevice) = split;
- $map{$olddevice} = $grubdevice;
-}
-
-$device=~ m#^(/dev/[sh]d\D)(\d*)$# || die "Can't match device: $device\n";
-my ($disk,$partition) = ($1,$2);
-
-if ($map{$disk}) {
- $grubdevice=$map{$disk};
-} else {
- die "No match in $devicemap for $disk\n";
-}
-
-if ($partition) {
- $partition--;
- $grubdevice=~s/\)/,$partition\)/;
-}
-
-print "$grubdevice\n";
-exit 0;
Copied: trunk/scripts/device2grub (from rev 2933, trunk/lib/device2grub)
Deleted: trunk/scripts/fai-start-stop-daemon
===================================================================
--- trunk/scripts/fai-start-stop-daemon 2005-10-13 13:47:44 UTC (rev 2940)
+++ trunk/scripts/fai-start-stop-daemon 2005-10-13 13:48:30 UTC (rev 2941)
@@ -1,40 +0,0 @@
-#! /bin/sh
-
-# $Id$
-#*********************************************************************
-#
-# start-stop-daemon -- a version which never starts daemons
-#
-# This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2004 by Thomas Lange, lange at informatik.uni-koeln.de
-# 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.
-#
-# A copy of the GNU General Public License is available as
-# `/usr/share/common-licences/GPL' in the Debian GNU/Linux distribution
-# or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html. You
-# can also obtain it by writing to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#*********************************************************************
-
-for opt in "$@" ; do
- case "$opt" in
- -o|--oknodo) oknodo=1 ;;
- -S|--start) start=1 ;;
- -K|--stop) stop=1 ;;
- esac
-done
-
-[ -n "$stop" -a -z "$oknodo" ] && exit 1
-
-exit 0
Copied: trunk/scripts/start-stop-daemon (from rev 2932, trunk/scripts/fai-start-stop-daemon)
More information about the Fai-commit
mailing list