From 0b91f048b0edb4a0116c74b5b9656d75f7b88b9e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 13 Sep 2007 01:39:48 +0200 Subject: [PATCH] Apply patch-bomb by ft, thanks a lot --- debian/changelog | 6 ++++++ debian/control | 3 +++ grml2usb | 11 ++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6e0961..e671daf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml2usb (0.7.7) unstable; urgency=low + + * Improve error handling for execution of syslinux. + + -- Michael Prokop Thu, 13 Sep 2007 01:38:31 +0200 + grml2usb (0.7.6) unstable; urgency=low * The "reworked grml2usb for JUXLALA"-release. diff --git a/debian/control b/debian/control index 8479bff..60702b4 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,9 @@ Priority: optional Maintainer: Michael Prokop Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.7.2 +Homepage: http://hg.grml.org/grml2usb/ +XS-Vcs-hg: http://hg.grml.org/grml2usb/ +XS-Vcs-Browser: http://hg.grml.org/grml2usb/ Package: grml2usb Architecture: all diff --git a/grml2usb b/grml2usb index cc086ef..5a9eed0 100755 --- a/grml2usb +++ b/grml2usb @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Jun 08 18:06:54 CEST 2007 [mika] +# Latest change: Don Sep 13 01:38:26 CEST 2007 [mika] ################################################################################ # colors {{{ @@ -81,7 +81,7 @@ Usage: /mount/point should not be mounted at the time running $PROGRAMNAME Usage example - install grml-small to usb-device on /mnt/external1: - $PROGRAMNAME grml_small_0.2.iso /mnt/external1 + $PROGRAMNAME grml_small_0.4.iso /mnt/external1 Usage example - install currently running grml to usb-device on /mnt/external1: $PROGRAMNAME /cdrom /mnt/external1 @@ -200,8 +200,13 @@ run_syslinux(){ SYSDEV=$(echo ${TMPDEV%/}) echo -n "Running syslinux on ${SYSDEV}: " debugit "debug: syslinux ${SYSDEV}" - syslinux ${SYSDEV} && echo "${WHITE}done${NORMAL}" || echo 1>&2 "${RED}Problem when running syslinux? + if syslinux ${SYSDEV} ; then + echo "${WHITE}done${NORMAL}" + else + echo 1>&2 "${RED}Problem when running syslinux? Try to call it manually via "syslinux $SYSDEV" if you installed grml to $SYSDEV'${NORMAL}" + return 1 + fi } # }}} -- 2.1.4