projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added tag 0.7.8 for changeset e10c87f88ec9ef7ec99f9773bb77ac745ea7aebf
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
cc086ef
..
3153a72
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-4,7
+4,7
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Fre
Jun 08 18:06:54 CES
T 2007 [mika]
+# Latest change: Fre
Nov 16 08:29:17 CE
T 2007 [mika]
################################################################################
# colors {{{
################################################################################
# colors {{{
@@
-49,7
+49,7
@@
LANGUAGE='C'
LC_ALL='C'
PROGRAMNAME=${0##*/}
LANGUAGE='C'
LC_ALL='C'
PROGRAMNAME=${0##*/}
- VERSION='0.7.
6
'
+ VERSION='0.7.
8
'
ISO="$1"
DEVICE="$2"
ISO="$1"
DEVICE="$2"
@@
-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:
/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
Usage example - install currently running grml to usb-device on /mnt/external1:
$PROGRAMNAME /cdrom /mnt/external1
@@
-184,9
+184,17
@@
copyit(){
cp ${DEVICE}/boot/isolinux/isolinux.cfg ${DEVICE}/boot/isolinux/syslinux.cfg && \
echo 'syslinux.cfg' >> $DEVICE/grml2usb.filelist
fi
cp ${DEVICE}/boot/isolinux/isolinux.cfg ${DEVICE}/boot/isolinux/syslinux.cfg && \
echo 'syslinux.cfg' >> $DEVICE/grml2usb.filelist
fi
- mv ${DEVICE}/boot/isolinux/* ${DEVICE}/ && \
- rmdir ${DEVICE}/boot/isolinux && \
- rmdir ${DEVICE}/boot/
+
+ if mv ${DEVICE}/boot/isolinux/* ${DEVICE}/ ; then
+ rmdir ${DEVICE}/boot/isolinux
+ fi
+
+ if [ -d ${DEIVCE}/boot/grub ] ; then
+ mv ${DEVICE}/boot/grub ${DEVICE}
+ fi
+
+ rmdir ${DEVICE}/boot 2>/dev/null
+
sync && echo "${WHITE}done${NORMAL}"
else
unmount
sync && echo "${WHITE}done${NORMAL}"
else
unmount
@@
-200,8
+208,13
@@
run_syslinux(){
SYSDEV=$(echo ${TMPDEV%/})
echo -n "Running syslinux on ${SYSDEV}: "
debugit "debug: syslinux ${SYSDEV}"
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}"
Try to call it manually via "syslinux $SYSDEV" if you installed grml to $SYSDEV'${NORMAL}"
+ return 1
+ fi
}
# }}}
}
# }}}