summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-08-06 03:38:09 (GMT)
committer Jaromil <jaromil@dyne.org>2011-08-06 03:38:09 (GMT)
commitb28b776dc3d1e524e099bd0ca81e310208cc2802 (patch)
treec2d4a51aaa3594fde2fe979e8ebd8c8a9105b712
parent12dea59a1d87234dd9f367cc5ac8fcd709af660d (diff)
added fromiso kernel parameter
now this should boot correctly
-rwxr-xr-xdyneIII/live-usb/live-usb.sh19
1 files changed, 9 insertions, 10 deletions
diff --git a/dyneIII/live-usb/live-usb.sh b/dyneIII/live-usb/live-usb.sh
index 5946c98..e59156c 100755
--- a/dyneIII/live-usb/live-usb.sh
+++ b/dyneIII/live-usb/live-usb.sh
@@ -5,26 +5,25 @@
# ripped from a tutorial/script by Panticz
# maintained for dyneIII by Jaromil
-# GNU GPL v3
+# FWIW, GNU GPL v3
# some documentation links:
# http://www.panticz.de/MultiBootUSB
-# https://bugs.launchpad.net/ubuntu/+bug/94204
-# http://debianforum.de/forum/viewtopic.php?f=32&t=111249
-# http://michael-prokop.at/blog/2009/05/25/boot-an-iso-via-grub2/
-# https://wiki.edubuntu.org/Grub2
-# http://wiki.ubuntuusers.de/GRUB_2/Konfiguration?highlight=cd
+# http://tails.boum.org/todo/usb_install_and_upgrade/
if [ -z $1 ]; then
- echo "usage: $0 /dev/sdX (device)"
+ echo "usage: $0 /dev/sdX live-image.iso"
+ echo "/dev/sdX device is not a partition"
exit 1
fi
DEVICE=${1}
VOLUME=dyneIII
MNT=/mnt/1
+ISO=`basename ${2}`
+ISOPATH=`dirname ${2}`
if ! [ -r $DEVICE ]; then
echo "error: device $DEVICE not found"
@@ -47,7 +46,7 @@ echo "device correctly mounted:"
mount | grep "${DEVICE}"
echo "starting to copy ISO file..."
-sudo rsync -P /srv/iso/dyneIII-shareit.iso ${MNT}
+sudo rsync -P ${ISOPATH}/${ISO} ${MNT}
echo "installing grub..."
# install grub2 on usb pen
@@ -56,8 +55,8 @@ sudo grub-install --no-floppy --root-directory=${MNT} ${DEVICE}
# create grub config
cat <<EOF> /tmp/live-usb-grub.cfg
menuentry "dyne:bolic 3.0" {
- loopback loop /dyneIII-shareit.iso
- linux (loop)/live/vmlinuz boot=live iso-scan/filename=/dyneII-shareit.iso noeject noprompt --
+ loopback loop /${ISO}
+ linux (loop)/live/vmlinuz boot=live iso-scan/filename=/${ISO} fromiso=/dev/sda1/${ISO} noeject noprompt --
initrd (loop)/live/initrd.img
}
EOF