[tyndur-devel] [PATCH] Buildsystem: root-local eingefuehrt fuer Images

[Antoine Kaufmann <toni@xxxxxxxxxx>]

* Buildsystem: root-local eingefuehrt, dessen Inhalt ganz zuletzt auf
               die Images kopiert wird. Das schont meine Nerven, da ich
               dort die Konfiguration fuer mein lpt-Repo und fuer tcpip
               lagern kann, ohne dass git sie dauernd ueberschreibt.

Signed-off-by: Antoine Kaufmann <toni@xxxxxxxxxx>
---
 build/scripts/image_cdrom  |    3 ++-
 build/scripts/image_floppy |    2 ++
 build/scripts/image_hd     |    2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/build/scripts/image_cdrom b/build/scripts/image_cdrom
index 2028bd6..1d8fadb 100755
--- a/build/scripts/image_cdrom
+++ b/build/scripts/image_cdrom
@@ -36,6 +36,7 @@
 ROOT=build/root
 ROOT_COMMON=build/root-common
 ROOT_CDROM=build/root-cdrom
+ROOT_LOCAL=build/root-local
 
 STAGE2_ELTORITO=/usr/lib/grub/i386-pc/stage2_eltorito
 
@@ -111,7 +112,7 @@ rm -f $MTOOLSRC
 
 # CD-Image bauen
 cp $FLOPPY_IMAGE_PATH $ROOT_CDROM
-mkisofs -b $(basename $FLOPPY_IMAGE_PATH) -m .svn -o $IMAGE_PATH $ROOT $ROOT_COMMON $ROOT_CDROM
+mkisofs -b $(basename $FLOPPY_IMAGE_PATH) -m .svn -o $IMAGE_PATH $ROOT $ROOT_COMMON $ROOT_CDROM $ROOT_LOCAL
 rm $ROOT_CDROM/$(basename $FLOPPY_IMAGE_PATH)
 
 echo "CD-Image erfolgreich erstellt!"
diff --git a/build/scripts/image_floppy b/build/scripts/image_floppy
index 429fbdb..ca7ad2c 100755
--- a/build/scripts/image_floppy
+++ b/build/scripts/image_floppy
@@ -36,6 +36,7 @@
 ROOT=build/root
 ROOT_COMMON=build/root-common
 ROOT_FLOPPY=build/root-floppy
+ROOT_LOCAL=build/root-local
 
 export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
 
@@ -64,6 +65,7 @@ fi
 
 
 mcopy -D o -s $ROOT/* $ROOT_COMMON/* $ROOT_FLOPPY/* l:/
+mcopy -D o -s $ROOT_LOCAL/* l:/
 
 # Grub-Konfiguration kopieren
 mcopy -D o build/config/grub_floppy.cfg l:/boot/grub/menu.lst
diff --git a/build/scripts/image_hd b/build/scripts/image_hd
index 81a33a2..d8fb3f6 100755
--- a/build/scripts/image_hd
+++ b/build/scripts/image_hd
@@ -36,6 +36,7 @@
 ROOT=build/root
 ROOT_COMMON=build/root-common
 ROOT_HD=build/root-hd
+ROOT_LOCAL=build/root-local
 MOUNT=build/mnt
 SUDO=sudo
 
@@ -85,6 +86,7 @@ $SUDO chmod 777 -R $MOUNT
 
 # Daten Kopieren
 cp -rP --preserve=links,timestamps $ROOT/* $ROOT_COMMON/* $ROOT_HD/* $MOUNT/
+cp -rP --preserve=links,timestamps $ROOT_LOCAL/* $MOUNT/
 
 # GRUB-Konfiguration kopieren
 mkdir -p $MOUNT/boot/grub
-- 
1.6.0.6