projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a93ae86
)
grml2iso: fix i386<->amd64 with grub-mkimage
author
Michael Prokop
<mika@grml.org>
Mon, 8 Jun 2009 22:22:28 +0000
(
00:22
+0200)
committer
Michael Prokop
<mika@grml.org>
Mon, 8 Jun 2009 22:22:28 +0000
(
00:22
+0200)
debian/changelog
patch
|
blob
|
history
grml2iso
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
437c5dc
..
01289da
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-16,14
+16,16
@@
grml2usb (0.9.8) UNRELEASED; urgency=low
* Use 'forensic' and 'readonly' in the forensic bootoption itself.
* Spelling fixes (thanks to Thorsten Glaser <tg@mirbsd.org>).
* Write GRUB2 config even if the target is a directory (thanks, Thorsten)
* Use 'forensic' and 'readonly' in the forensic bootoption itself.
* Spelling fixes (thanks to Thorsten Glaser <tg@mirbsd.org>).
* Write GRUB2 config even if the target is a directory (thanks, Thorsten)
- * All these “set root=” are not needed for GRUB2 (thanks, Thorsten)
- * Add grml2iso for creating a bootable DVD (thanks again for help
- and patches, Thorsten).
+ * All these "set root=" are not needed for GRUB2 (thanks, Thorsten)
* Switch order of check whether the specified device is a directory
and check for usb device (as the usb device check will fail if
it's a directory).
* Switch order of check whether the specified device is a directory
and check for usb device (as the usb device check will fail if
it's a directory).
+ * Add grml2iso for creating a bootable DVD:
+ - thanks once more to Thorsten Glaser for helping and patches
+ - thanks to Ernesto Domato for reporting the issue regarding
+ i386<->amd64 with grub-mkimage
- -- Michael Prokop <mika@grml.org>
Mon, 08 Jun 2009 00:48:17
+0200
+ -- Michael Prokop <mika@grml.org>
Tue, 09 Jun 2009 00:20:38
+0200
grml2usb (0.9.7) unstable; urgency=low
grml2usb (0.9.7) unstable; urgency=low
diff --git
a/grml2iso
b/grml2iso
index
23b693d
..
a1eb117
100755
(executable)
--- a/
grml2iso
+++ b/
grml2iso
@@
-67,8
+67,8
@@
# variables {{{
ORIG_DIR="$(pwd)"
# variables {{{
ORIG_DIR="$(pwd)"
- # note: grub-pc_1.96+20090603-1
_i386.deb
seems to be b0rken
- GRUB_
DEB="grub-pc_1.96+20080724-16_i386.deb
"
+ # note: grub-pc_1.96+20090603-1 seems to be b0rken
+ GRUB_
VERSION="grub-pc_1.96+20080724-16
"
# normalise path
case $ISOFILE in
# normalise path
case $ISOFILE in
@@
-90,6
+90,13
@@
# install grub2 files {{{
# as we don't want to rely on a grub2 installation on the
# running system let's grab it from the net
# install grub2 files {{{
# as we don't want to rely on a grub2 installation on the
# running system let's grab it from the net
+ if which dpkg >/dev/null 2>&1 ; then
+ ARCH="$(dpkg --print-architecture)"
+ else
+ [[ $(uname -m) == x86_64 ]] && ARCH=amd64 || ARCH=i386
+ fi
+ GRUB_DEB="${GRUB_VERSION}_${ARCH}.deb"
+
cd "$WRKDIR"/grub_tmp/
wget http://ftp.de.debian.org/debian/pool/main/g/grub2/"$GRUB_DEB"
ar x "$GRUB_DEB"
cd "$WRKDIR"/grub_tmp/
wget http://ftp.de.debian.org/debian/pool/main/g/grub2/"$GRUB_DEB"
ar x "$GRUB_DEB"