View | Details | Raw Unified | Return to bug 11154
Collapse All | Expand All

(-)spt-0.6.0.orig/scripts/spt (-4 / +9 lines)
Lines 23-29 Link Here
23
	local rc=$?
23
	local rc=$?
24
	trap - EXIT
24
	trap - EXIT
25
	if [ -z "$nocleanup" ]; then
25
	if [ -z "$nocleanup" ]; then
26
		hsh ${number:+--number="$number"} --cleanup -- "$workdir"
26
		hsh ${number:+--number="$number"} --cleanup -- "$workdir" >&2
27
		rm -rf -- "$tmpdir" "$outdir"
27
		rm -rf -- "$tmpdir" "$outdir"
28
	fi
28
	fi
29
	exit $rc
29
	exit $rc
Lines 57-62 Link Here
57
		mkiso=
57
		mkiso=
58
		cat "$tmpdir/.archive.tar" | gzip -f9 > "$workdir/$OUT.tar.gz"
58
		cat "$tmpdir/.archive.tar" | gzip -f9 > "$workdir/$OUT.tar.gz"
59
		;;
59
		;;
60
	    pipe)
61
		mkiso=
62
		cat "$tmpdir/.archive.tar"
63
		;;
60
	    *)
64
	    *)
61
		Fatal 'Unsupported image type.'
65
		Fatal 'Unsupported image type.'
62
		;;
66
		;;
Lines 75-81 Link Here
75
	[ -z "$copy_init_list" ] ||
79
	[ -z "$copy_init_list" ] ||
76
		hsh-install "$workdir" $verbose $quiet $excludedocs \
80
		hsh-install "$workdir" $verbose $quiet $excludedocs \
77
			${number:+--number="$number"} \
81
			${number:+--number="$number"} \
78
			$copy_init_list
82
			$copy_init_list >&2
79
83
80
	[ -z "$FILES" ] ||
84
	[ -z "$FILES" ] ||
81
		rsync $verbose -rtlpC "$profile_dir/$FILES" "$outdir" ||
85
		rsync $verbose -rtlpC "$profile_dir/$FILES" "$outdir" ||
Lines 115-121 Link Here
115
119
116
	if [ -n "$HOOKPKGS" ]; then
120
	if [ -n "$HOOKPKGS" ]; then
117
		Verbose "Installation packages for hook"
121
		Verbose "Installation packages for hook"
118
		hsh-install "$workdir" $verbose $quiet $excludedocs ${number:+--number="$number"} $HOOKPKGS
122
		hsh-install "$workdir" $verbose $quiet $excludedocs ${number:+--number="$number"} $HOOKPKGS >&2
119
	fi
123
	fi
120
124
121
	packages="$profile_dir/$IDENT/packages"
125
	packages="$profile_dir/$IDENT/packages"
Lines 194-199 Link Here
194
        ext2               ext2fs
198
        ext2               ext2fs
195
        tbz2               tarball + bzip2 (always --noiso)
199
        tbz2               tarball + bzip2 (always --noiso)
196
        tgz                tarball + gzip  (always --noiso)
200
        tgz                tarball + gzip  (always --noiso)
201
	pipe               tarball to stdout
197
  --excludedocs            exclude docs during install
202
  --excludedocs            exclude docs during install
198
  --arch=ARCH              target architecture
203
  --arch=ARCH              target architecture
199
  --apt-config=FILE        path to custom apt.conf file
204
  --apt-config=FILE        path to custom apt.conf file
Lines 233-239 Link Here
233
		    squashfs)
238
		    squashfs)
234
			    image_type="$1"
239
			    image_type="$1"
235
			    ;;
240
			    ;;
236
		    tbz2|tgz)
241
		    tbz2|tgz|pipe)
237
			    image_type="$1"
242
			    image_type="$1"
238
			    mkboot=
243
			    mkboot=
239
			    mkiso=
244
			    mkiso=
(-)spt-0.6.0.orig/scripts/spt-sh-functions (-2 / +2 lines)
Lines 99-105 Link Here
99
		# Described in /usr/share/doc/hasher-priv-*/DESIGN file.
99
		# Described in /usr/share/doc/hasher-priv-*/DESIGN file.
100
		init_dev_list='console tty0 tty ptmx'
100
		init_dev_list='console tty0 tty ptmx'
101
		for node in ${init_dev_list}; do
101
		for node in ${init_dev_list}; do
102
			hsh-fakedev $verbose $quiet ${number:+--number="$number"} -o root -r /dev/"$node" "$workdir" ||
102
			hsh-fakedev $verbose $quiet ${number:+--number="$number"} -o root -r /dev/"$node" "$workdir" >&2 ||
103
				Fatal 'Failed to initialize devices.'
103
				Fatal 'Failed to initialize devices.'
104
		done
104
		done
105
}
105
}
Lines 122-128 Link Here
122
         --save-fakeroot \
122
         --save-fakeroot \
123
	 --without-stuff \
123
	 --without-stuff \
124
         --pkg-init-list="setup filesystem rpm fakeroot>=0:0.7.3 findutils tar $*" \
124
         --pkg-init-list="setup filesystem rpm fakeroot>=0:0.7.3 findutils tar $*" \
125
         --pkg-build-list=',' ||
125
         --pkg-build-list=',' >&2 ||
126
	 	Fatal 'Failed to initialize boot.'
126
	 	Fatal 'Failed to initialize boot.'
127
    rm -rf -- "$workdir/repo"
127
    rm -rf -- "$workdir/repo"
128
}
128
}

Return to bug 11154