From b6c69ed6f5d2d3ff71c2c5daa529092b46578912 Mon Sep 17 00:00:00 2001
From: Tobias Hintze <th@rocklinux.org>
Date: Mon, 6 Aug 2007 12:27:40 +0000
Subject: [PATCH] Tobias Hintze: 	updated package/teha/rockinitramfs to
 version 5

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8677 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/teha/rockinitramfs/build.d/07-udev    |  2 +-
 .../teha/rockinitramfs/libexec/mkinitramfs.sh | 21 ++++++++++++-------
 package/teha/rockinitramfs/rockinitramfs.desc |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/package/teha/rockinitramfs/build.d/07-udev b/package/teha/rockinitramfs/build.d/07-udev
index 039acb575..d069b4b63 100644
--- a/package/teha/rockinitramfs/build.d/07-udev
+++ b/package/teha/rockinitramfs/build.d/07-udev
@@ -36,7 +36,7 @@ slink /lib/udev/devices/stderr /proc/self/fd/2 755 0 0
 EOF
 
 (
-	cd $rootdir
+	cd ${rootdir}/
 	find etc/udev/rules.d -maxdepth 1 -type f | while read x
 	do
 		echo "file $x $rootdir/$x 644 0 0"
diff --git a/package/teha/rockinitramfs/libexec/mkinitramfs.sh b/package/teha/rockinitramfs/libexec/mkinitramfs.sh
index 78b6c4f11..42a569d4f 100755
--- a/package/teha/rockinitramfs/libexec/mkinitramfs.sh
+++ b/package/teha/rockinitramfs/libexec/mkinitramfs.sh
@@ -90,6 +90,10 @@ do
 			filesdir="$2"
 			shift
 			;;
+		--libexec-dir)
+			libexecdir="$2"
+			shift
+			;;
 		--add-gen-line)
 			additional_gen_lines="$additional_gen_lines;$2"
 			shift
@@ -118,17 +122,19 @@ then
 fi
 
 export BASE=$rootdir/lib/rock_initramfs
-export LIBEXEC=${BASE}/libexec
 
-[ -z "$builddir" ] && builddir="$BASE/build.d"
-[ -z "$filesdir" ] && filesdir="$BASE/files"
-[ "${builddir:0:1}" = "/" ] || builddir="$rootdir/$builddir"
-[ "${filesdir:0:1}" = "/" ] || filesdir="$rootdir/$filesdir"
+[ -z "$builddir" ]   && builddir="$BASE/build.d"
+[ -z "$filesdir" ]   && filesdir="$BASE/files"
+[ -z "$libexecdir" ] && libexecdir="$BASE/libexec"
+[ "${builddir:0:1}" = "/" ]   || builddir="$rootdir/$builddir"
+[ "${filesdir:0:1}" = "/" ]   || filesdir="$rootdir/$filesdir"
+[ "${libexecdir:0:1}" = "/" ] || libexecdir="$rootdir/$libexecdir"
 
 [ ${outfile:0:1} = "/" ] || outfile="`pwd`/$outfile"
 [ ${listoutfile:0:1} = "/" ] || listoutfile="`pwd`/$listoutfile"
 [ ${mod_origin:0:1} = "/" ] || mod_origin="`pwd`/$mod_origin"
 
+[ -z "$rootdir" ] && rootdir=/
 
 cat << EOF
 kernel version: $k_ver
@@ -138,6 +144,7 @@ output file: $outfile
 root dir: $rootdir
 build dir: $builddir
 files dir: $filesdir
+libexec dir: $libexecdir
 EOF
 
 export rootdir
@@ -152,7 +159,7 @@ export TMPDIR="/tmp/irfs-`date +%s`.$$"
 mkdir -pv $TMPDIR
 
 # compile our list of cpio-content
-${LIBEXEC}/build-list.sh > ${TMPDIR}/list
+${libexecdir}/build-list.sh > ${TMPDIR}/list
 echo "$additional_gen_lines" | tr ';' '\n' >> ${TMPDIR}/list
 
 if [ -n "$verbose" ]
@@ -165,7 +172,7 @@ fi
 
 # create and compress cpio archive
 if [ -z "$gen_init_cpio" ] ; then
-	${LIBEXEC}/gen_init_cpio ${TMPDIR}/list | gzip -9 > $outfile
+	${libexecdir}/gen_init_cpio ${TMPDIR}/list | gzip -9 > $outfile
 else
 	${gen_init_cpio} ${TMPDIR}/list | gzip -9 > $outfile
 fi
diff --git a/package/teha/rockinitramfs/rockinitramfs.desc b/package/teha/rockinitramfs/rockinitramfs.desc
index 636221f2e..3e50f774d 100644
--- a/package/teha/rockinitramfs/rockinitramfs.desc
+++ b/package/teha/rockinitramfs/rockinitramfs.desc
@@ -34,6 +34,6 @@
 
 [L] GPL
 [S] Stable
-[V] 4
+[V] 5
 [P] X -X---5---9 236.500