[Fai-commit] r4605 - people/michael/features/setup_harddisks_2/implementation

[andreas at alioth.debian.org]

Author: andreas
Date: 2007-10-08 21:34:06 +0000 (Mon, 08 Oct 2007)
New Revision: 4605

Modified:
   people/michael/features/setup_harddisks_2/implementation/Makefile
   people/michael/features/setup_harddisks_2/implementation/shdd2-init
   people/michael/features/setup_harddisks_2/implementation/shdd2-parser
Log:
adding install target that installs into fai nfsroot

Modified: people/michael/features/setup_harddisks_2/implementation/Makefile
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/Makefile	2007-10-02 14:24:16 UTC (rev 4604)
+++ people/michael/features/setup_harddisks_2/implementation/Makefile	2007-10-08 21:34:06 UTC (rev 4605)
@@ -1,5 +1,8 @@
 .PHONY: tidy move
 
+DESTDIR=/srv/fai/nfsroot/live/filesystem.dir
+DEST=$(DESTDIR)/usr/lib/perl/5.8
+
 FILES = shdd2 \
 	shdd2-commands \
 	shdd2-exec \
@@ -16,3 +19,7 @@
 move:
 	for i in shdd2*.tdy ; do mv $$i `echo $$i | sed 's/.tdy//'` ; done
 
+install:
+	install -d $(DEST)
+	install -m 744 $(FILES) $(DEST) 
+	ln -s $(DESTDIR)/usr/bin/shdd2 $(DEST)/shdd2 

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-init
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-init	2007-10-02 14:24:16 UTC (rev 4604)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-init	2007-10-08 21:34:06 UTC (rev 4605)
@@ -49,6 +49,7 @@
 #
 ################################################################################
 @FAI::disks = split( /\n/, $ENV{disklist} );
+( $FAI::debug > 0 ) and print "disklist was:\n" . $ENV{disklist};
 
 ################################################################################
 #

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-parser
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2007-10-02 14:24:16 UTC (rev 4604)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2007-10-08 21:34:06 UTC (rev 4605)
@@ -375,8 +375,9 @@
             die "mdadm not found in PATH\n";
           $FAI::device = "RAID";
         }
-        | 'lvm'
+        | /^lvm/
         {
+	  ( $FAI::debug > 0 ) and print "Found LVM keyword\n";
           # check, whether lvm tools are available
           ( &FAI::in_path( "lvcreate" ) == 1 ) or 
             die "LVM tools not found in PATH\n";