Merge branch 'master' of ssh://openslx/openslx-ng/tm-scripts

1 files changed, 16 insertions, 12 deletions

diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index dbcbf8e9..d39fbe87 100644..100755
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -76,27 +76,31 @@ copy_static_data() {
 #
 # generate initramfs of directory
 # usage:
-#	generate_initramfs <target_filename> <source_dir>
-#
+#	generate_initramfs <source_dir> <files> <destination_dir/filename>
+# example:
+#	generate_initramfs "./server/boot/stage32_sqfs" "./mnt/openslx.sqfs" "./server/boot/initramfs2"
+#	generate_initramfs "./server/build/stage31" "." "./server/boot/initramfs"
+ 
 generate_initramfs() {
-	[ $# -ne 2 ] && perror "Sanity check failed: generate_initramfs needs exactly two params, but $# were given."
-        cd "$2" || perror "Cannot cd to '$2'"
-        find . | cpio --format="newc" --create | gzip -9 > "${MODULE_DIR}/$1"
+	[ $# -ne 3 ] && perror "Sanity check failed: generate_initramfs needs exactly two params, but $# were given."
+        cd "$1" || perror "Cannot cd to '$1'"
+	
+        find $2 | cpio --format="newc" --create | gzip -9 > "$3"
         local PS=(${PIPESTATUS[*]})
-        [ "x${PS[0]}" != "x0" ] && perror "'find .' in '$(pwd)' failed."
+        [ "x${PS[0]}" != "x0" ] && perror "'find $2' in '$(pwd)' failed."
         [ "x${PS[1]}" != "x0" ] && perror "cpio create failed."
-        [ "x${PS[2]}" != "x0" ] && perror "gzip to '${MODULE_DIR}/$1' failed."
+        [ "x${PS[2]}" != "x0" ] && perror "gzip to '$3' failed."
         cd -
-        pinfo "Created initramfs of $2 at ${MODULE_DIR}/$1"
+        pinfo "Created initramfs of $1 at $3"
 }
 
 # generates squashfs of directory
 # usage:
-#	generate_squashfs <target_filename> <source_dir>
+#	generate_squashfs <source_dir> <destination_dir/filename>
 generate_squashfs() {
 	[ $# -ne 2 ] && perror "Sanity check failed: generate_squashfs needs exactly two params, but $# were given."
-	[ -d $2 ] || perror "$2 is not a directory."
-	mksquashfs "$2" "${MODULE_DIR}/$1" -comp xz -b 1M -no-recovery >&6 \
+	[ -d "$1" ] || perror "$1 is not a directory."
+	mksquashfs "$1" "$2" -comp xz -b 1M -no-recovery >&6 \
 	        || perror "mksquashfs failed ($?)."
-	pinfo "Created squashfs of $2 at ${MODULE_DIR}/$1"
+	pinfo "Created squashfs of $1 at $2"
 }