fix error_out (line/errno handling)

M. Dietrich committed 10 years ago

Commit fbe5b8d1 parent 7428a521 file · +2 −2Browse files

Unified · Split

mklive.sh.in+2−2

@@ -26,7 +26,7 @@ · 25 unmodified lines
26	26	# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27	27	# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28	#-
29		−trap "error_out $LINENO $?" INT TERM 0
	29	+trap 'error_out $? $LINENO' INT TERM 0
30	30
31	31	readonly REQUIRED_PKGS="base-files libgcc dash coreutils sed tar gawk syslinux grub-i386-efi grub-x86_64-efi squashfs-tools xorriso"
32	32	readonly INITRAMFS_PKGS="binutils xz device-mapper"
@@ -37,7 +37,7 @@ info_msg() { · 4 unmodified lines
37	37	}
38	38	die() {
39	39	info_msg "ERROR: $@"
40		− error_out 1
	40	+ error_out 1 $LINENO
41	41	}
42	42	print_step() {
43	43	CURRENT_STEP=$((CURRENT_STEP+1))