Attachment 1867 Details for Bug 11154 – spt-0.6.0-pipe.patch

[patch] spt-0.6.0-pipe.patch

spt-0.6.0-pipe.patch (text/plain), 2.65 KB, created by led on 2007-03-19 19:49:45 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: led

Created: 2007-03-19 19:49:45 MSK

Size: 2.65 KB

patch

obsolete

>diff -urN spt-0.6.0.orig/scripts/spt spt-0.6.0/scripts/spt
>--- spt-0.6.0.orig/scripts/spt	2007-03-14 01:34:57 +0200
>+++ spt-0.6.0/scripts/spt	2007-03-19 17:02:09 +0200
>@@ -23,7 +23,7 @@
> 	local rc=$?
> 	trap - EXIT
> 	if [ -z "$nocleanup" ]; then
>-		hsh ${number:+--number="$number"} --cleanup -- "$workdir"
>+		hsh ${number:+--number="$number"} --cleanup -- "$workdir" >&2
> 		rm -rf -- "$tmpdir" "$outdir"
> 	fi
> 	exit $rc
>@@ -57,6 +57,10 @@
> 		mkiso=
> 		cat "$tmpdir/.archive.tar" | gzip -f9 > "$workdir/$OUT.tar.gz"
> 		;;
>+	    pipe)
>+		mkiso=
>+		cat "$tmpdir/.archive.tar"
>+		;;
> 	    *)
> 		Fatal 'Unsupported image type.'
> 		;;
>@@ -75,7 +79,7 @@
> 	[ -z "$copy_init_list" ] ||
> 		hsh-install "$workdir" $verbose $quiet $excludedocs \
> 			${number:+--number="$number"} \
>-			$copy_init_list
>+			$copy_init_list >&2
> 
> 	[ -z "$FILES" ] ||
> 		rsync $verbose -rtlpC "$profile_dir/$FILES" "$outdir" ||
>@@ -115,7 +119,7 @@
> 
> 	if [ -n "$HOOKPKGS" ]; then
> 		Verbose "Installation packages for hook"
>-		hsh-install "$workdir" $verbose $quiet $excludedocs ${number:+--number="$number"} $HOOKPKGS
>+		hsh-install "$workdir" $verbose $quiet $excludedocs ${number:+--number="$number"} $HOOKPKGS >&2
> 	fi
> 
> 	packages="$profile_dir/$IDENT/packages"
>@@ -194,6 +198,7 @@
>         ext2               ext2fs
>         tbz2               tarball + bzip2 (always --noiso)
>         tgz                tarball + gzip  (always --noiso)
>+	pipe               tarball to stdout
>   --excludedocs            exclude docs during install
>   --arch=ARCH              target architecture
>   --apt-config=FILE        path to custom apt.conf file
>@@ -233,7 +238,7 @@
> 		    squashfs)
> 			    image_type="$1"
> 			    ;;
>-		    tbz2|tgz)
>+		    tbz2|tgz|pipe)
> 			    image_type="$1"
> 			    mkboot=
> 			    mkiso=
>diff -urN spt-0.6.0.orig/scripts/spt-sh-functions spt-0.6.0/scripts/spt-sh-functions
>--- spt-0.6.0.orig/scripts/spt-sh-functions	2007-03-14 01:34:57 +0200
>+++ spt-0.6.0/scripts/spt-sh-functions	2007-03-19 18:17:58 +0200
>@@ -99,7 +99,7 @@
> 		# Described in /usr/share/doc/hasher-priv-*/DESIGN file.
> 		init_dev_list='console tty0 tty ptmx'
> 		for node in ${init_dev_list}; do
>-			hsh-fakedev $verbose $quiet ${number:+--number="$number"} -o root -r /dev/"$node" "$workdir" ||
>+			hsh-fakedev $verbose $quiet ${number:+--number="$number"} -o root -r /dev/"$node" "$workdir" >&2 ||
> 				Fatal 'Failed to initialize devices.'
> 		done
> }
>@@ -122,7 +122,7 @@
>          --save-fakeroot \
> 	 --without-stuff \
>          --pkg-init-list="setup filesystem rpm fakeroot>=0:0.7.3 findutils tar $*" \
>-         --pkg-build-list=',' ||
>+         --pkg-build-list=',' >&2 ||
> 	 	Fatal 'Failed to initialize boot.'
>     rm -rf -- "$workdir/repo"
> }

Actions: View | Diff

Attachments on bug 11154: 1867