Bug#242319: marked as done (mkbimage: random image contents)
Debian Bug Tracking System
owner@bugs.debian.org
Thu, 29 Apr 2004 14:48:15 -0700
Your message dated Thu, 29 Apr 2004 17:32:04 -0400
with message-id <E1BJJ8W-000071-00@newraff.debian.org>
and subject line Bug#242319: fixed in grub 0.94+cvs20040429-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 5 Apr 2004 22:04:39 +0000
>From ydirson@altern.org Mon Apr 05 15:04:39 2004
Return-path: <ydirson@altern.org>
Received: from smtp5.wanadoo.fr (mwinf0501.wanadoo.fr) [193.252.22.26]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BAcCt-0000Co-00; Mon, 05 Apr 2004 15:04:39 -0700
Received: from bylbo.nowhere.earth (APuteaux-115-1-17-244.w81-51.abo.wanadoo.fr [81.51.118.244])
by mwinf0501.wanadoo.fr (SMTP Server) with ESMTP
id 1C49D4000E2; Tue, 6 Apr 2004 00:04:08 +0200 (CEST)
Received: from dwitch by bylbo.nowhere.earth with local (Exim 3.36 #1 (Debian))
id 1BAcES-0007vr-00; Tue, 06 Apr 2004 00:06:16 +0200
Date: Tue, 6 Apr 2004 00:06:16 +0200
From: Yann Dirson <dirson@debian.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: mkbimage: random image contents
Message-ID: <20040405220615.GA28471@bylbo.nowhere.earth>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="45Z9DzgjV8m4Oswq"
Content-Disposition: inline
X-Debbugs-Cc: Thierry Laronde <tlaronde@polynum.org>, Robert Millan <zeratul2@wanadoo.es>
X-Reportbug-Version: 2.56
User-Agent: Mutt/1.5.5.1+cvs20040105i
Sender: Yann Dirson <ydirson@altern.org>
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-10.0 required=4.0 tests=BAYES_00,HAS_PACKAGE,
X_DEBBUGS_CC autolearn=ham version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
X-CrossAssassin-Scores: 1
--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Package: grub
Version: 0.93+cvs20031021-8
Severity: normal
1. When extracting the image tarball into a dir, the dir is not cleaned
first, resulting in possible extraneous files (my previous tarball was
b0rked, and with the correct one I had 2 stage2 files in my tree, which
caused failure)
2. When using e2tools (and possibly mtools), only boot/grub contents was
copied. This patch recreates all dirs and copies all files; although not
perfect, that should be sufficient for most purposes.
I also changed one more thing to make this script a bit more idiomatically
correct, with the idea of allowing it to run "set -e" some day.
--
Yann Dirson <ydirson@altern.org> | Why make M$-Bill richer & richer ?
Debian-related: <dirson@debian.org> | Support Debian GNU/Linux:
Pro: <yann.dirson@fr.alcove.com> | Freedom, Power, Stability, Gratuity
http://ydirson.free.fr/ | Check <http://www.debian.org/>
--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mkbimage.diff"
--- /bin/mkbimage 2003-08-09 14:19:43.000000000 +0200
+++ /export/work/yann/ltt/mkbimage 2004-04-05 23:53:50.000000000 +0200
@@ -178,9 +178,12 @@
esac
if [ "$offset" = 0 ] && which $cp > /dev/null ; then
- $mkdir ${image}:/boot
- $mkdir ${image}:/boot/grub
- $cp ${image}1/boot/grub/* ${image}:/boot/grub/
+ for dir in $(cd ${image}1 && find -type d) ; do
+ $mkdir ${image}:$dir
+ done
+ for file in $(cd ${image}1 && find -type f) ; do
+ $cp ${image}1/$file ${image}:$file
+ done
elif [ "`id -u`" = "0" ] ; then
losetup $lo_options /dev/loop1 $image
mkdir ${image}.mnt
@@ -355,7 +358,8 @@
mkbimage_mkfs
# then untar the files
-mkdir ${image}1 2>/dev/null
+[ ! -e ${image}1 ] || { echo "${image}1 exists, please remove it first"; exit 1;}
+mkdir -p ${image}1
$decompress $tarfile | tar -C ${image}1 $debug -xf -
# copy the untarred files into the filesystem image
@@ -364,7 +368,7 @@
#We verify that the stage2 exists and we search the name
stage2_os_name=`find ${image}1 -name stage2 -type f`
-[ ! $stage2_os_name ] && { echo "I can't find stage2!"; exit 1;}
+[ -r "$stage2_os_name" ] || { echo "I can't find stage2!"; exit 1;}
#------------------------- GRUB stuff
if [ "$image_type" = "hd" ]; then
@@ -408,4 +412,6 @@
Enjoy!
EOF
+rm -rf ${image}1
+
exit 0
--45Z9DzgjV8m4Oswq--
---------------------------------------
Received: (at 242319-close) by bugs.debian.org; 29 Apr 2004 21:38:12 +0000
>From katie@ftp-master.debian.org Thu Apr 29 14:38:12 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BJJES-000373-00; Thu, 29 Apr 2004 14:38:12 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1BJJ8W-000071-00; Thu, 29 Apr 2004 17:32:04 -0400
From: Robert Millan <rmh@debian.org>
To: 242319-close@bugs.debian.org
X-Katie: $Revision: 1.49 $
Subject: Bug#242319: fixed in grub 0.94+cvs20040429-1
Message-Id: <E1BJJ8W-000071-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Thu, 29 Apr 2004 17:32:04 -0400
Delivered-To: 242319-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
X-CrossAssassin-Score: 4
Source: grub
Source-Version: 0.94+cvs20040429-1
We believe that the bug you reported is fixed in the latest version of
grub, which is due to be installed in the Debian FTP archive:
grub-disk_0.94+cvs20040429-1_all.deb
to pool/main/g/grub/grub-disk_0.94+cvs20040429-1_all.deb
grub-doc_0.94+cvs20040429-1_all.deb
to pool/main/g/grub/grub-doc_0.94+cvs20040429-1_all.deb
grub_0.94+cvs20040429-1.diff.gz
to pool/main/g/grub/grub_0.94+cvs20040429-1.diff.gz
grub_0.94+cvs20040429-1.dsc
to pool/main/g/grub/grub_0.94+cvs20040429-1.dsc
grub_0.94+cvs20040429-1_i386.deb
to pool/main/g/grub/grub_0.94+cvs20040429-1_i386.deb
grub_0.94+cvs20040429.orig.tar.gz
to pool/main/g/grub/grub_0.94+cvs20040429.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 242319@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Robert Millan <rmh@debian.org> (supplier of updated grub package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Thu, 29 Apr 2004 21:15:59 +0200
Source: grub
Binary: grub-disk grub grub-doc
Architecture: source i386 all
Version: 0.94+cvs20040429-1
Distribution: unstable
Urgency: low
Maintainer: Grub-Devel <pkg-grub-devel@lists.alioth.debian.org>
Changed-By: Robert Millan <rmh@debian.org>
Description:
grub - GRand Unified Bootloader
grub-disk - GRUB bootable disk image
grub-doc - Documentation for GRand Unified Bootloader
Closes: 154534 216875 239066 242319 245350
Changes:
grub (0.94+cvs20040429-1) unstable; urgency=low
.
* New upstream snapshot. (Closes: #245350)
- patches/*.diff: Resync.
- Syntax fixes in mkbimage. Thanks Yann Dirson. (Closes: #239066, #242319)
- Includes CDROM support (at last!). (Closes: #154534)
- Fixes for kernel of FreeBSD 5.x. (Closes: #216875)
* Migrating to automake 1.8.
- control (Build-Depends): s/1.7/1.8/g
- rules: Ditto.
Files:
9e71572a348004d9abb8a4b332bef7a4 826 admin optional grub_0.94+cvs20040429-1.dsc
1cd0191b636b8733c1d4a7d05749fa68 892804 admin optional grub_0.94+cvs20040429.orig.tar.gz
a31f7ae80d8b023dd31d872dbabec509 44005 admin optional grub_0.94+cvs20040429-1.diff.gz
e1712bbbde7ff83b2528066707a04a8b 349196 admin optional grub_0.94+cvs20040429-1_i386.deb
1347f1ac4e6430d949862aedb86a4d74 521166 admin optional grub-disk_0.94+cvs20040429-1_all.deb
ceab76ed39d8ce3440e9d1a0ad6d0cda 249356 doc optional grub-doc_0.94+cvs20040429-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAkXElC19io6rUCv8RAjl/AJ9c6U2ldXweWM763FVg5rOalEGvwgCghKt0
eFzL55VXZK7g/nq2IUC5A3k=
=rLSN
-----END PGP SIGNATURE-----