From mboxrd@z Thu Jan 1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
38956241bb0644480887aeb9a399e3d9ba2fc3f4
Date: Tue, 23 Feb 2016 19:31:57 +0000
Message-ID: <20160223193158.116DA1081BC7@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1170759906715517209=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============1170759906715517209==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 38956241bb0644480887aeb9a399e3d9ba2fc3f4 (commit)
from ee552b7e1a8238b620b557f16baf2131cbafc104 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 38956241bb0644480887aeb9a399e3d9ba2fc3f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 23 19:49:49 2016 +0100
flash-image: fix root uuid on some build machines.
=20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/flash-images | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/lfs/flash-images b/lfs/flash-images
index 530bf33..f455822 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -182,9 +182,10 @@ endif
mkdir -pv $(MNThdd)/boot/grub
chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
=20
- # Insert the UUID because grub-mkconfig fails to detect that correctly
+ # Insert the UUID because grub-mkconfig often fails to
+ # detect that correctly
sed -i $(MNThdd)/boot/grub/grub.cfg \
- -e "s/root=3D[a-z0-9\/]*/root=3DUUID=3D$$(blkid -o value -s UUID $(PART_RO=
OT))/g"
+ -e "s/root=3D[A-Za-z0-9=3D-\/]*/root=3DUUID=3D$$(blkid -o value -s UUID $(=
PART_ROOT))/g"
=20
# Install GRUB
grub-install --force --recheck --no-floppy \
hooks/post-receive
--
IPFire 2.x development tree
--===============1170759906715517209==--