From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 3 May 2017 10:00:26 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21e3cd33b66e77d85ccb3a73b9ca777c73a2eb4f;p=thirdparty%2Fgrub.git

Merge branch 'master' into next
---

21e3cd33b66e77d85ccb3a73b9ca777c73a2eb4f
diff --cc tests/util/grub-fs-tester.in
index 53f910fd4,2337771a1..dc0942b4d
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@@ -684,10 -657,10 +687,10 @@@ for LOGSECSIZE in $(range "$MINLOGSECSI
  		    MOUNTOPTS="iocharset=utf8,compression,"
  		    MOUNTFS="ntfs-3g";;
  		x"udf")
- 		    "/usr/bin/mkudffs" -b $BLKSIZE --utf8 --lvid="$FSLABEL" "${MOUNTDEVICE}"
 -		    "mkudffs" --utf8 -b $BLKSIZE --lvid="$FSLABEL" "${LODEVICES[0]}"
++		    "mkudffs" --utf8 -b $BLKSIZE --lvid="$FSLABEL" "${MOUNTDEVICE}"
  		    MOUNTOPTS="iocharset=utf8,bs=$BLKSIZE,";;
  		x"ufs2")
 -		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 2 "${LODEVICES[0]}"
 +		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 2 "${MOUNTDEVICE}"
  		    MOUNTOPTS="ufstype=ufs2,"
  		    MOUNTFS="ufs";;
  		x"ufs1")
@@@ -995,41 -968,41 +1001,41 @@@
  		    sleep 2
  		    ;;
  		x"tarfs")
 -		    (cd "$MASTER"; tar cf "${FSIMAGES[0]}" .) ;;
 +		    (cd "$MASTER"; tar cf "${FSIMAGEP}0.img" .) ;;
  		x"cpio_"*)
 -		    (cd "$MASTER"; find . | cpio -o -H "${fs/cpio_/}" > "${FSIMAGES[0]}" ) ;;
 +		    (cd "$MASTER"; find . | cpio -o -H "$(echo ${fs} | sed 's@^cpio_@@')" > "${FSIMAGEP}0.img" ) ;;
  		x"ziso9660")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso -compliance rec_mtime -set_filter_r --zisofs -- -zisofs default -as mkisofs -iso-level 3 -graft-points -R -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}"  -- -set_filter_r --zisofs -- -zisofs default -add /="$MASTER" ;;
 +		    xorriso -compliance rec_mtime -set_filter_r --zisofs -- -zisofs default -as mkisofs -iso-level 3 -graft-points -R -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"  -- -set_filter_r --zisofs -- -zisofs default -add /="$MASTER" ;;
  		x"iso9660")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"joliet")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"rockridge")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"rockridge_joliet")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"iso9660_1999")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"joliet_1999")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"rockridge_1999")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"rockridge_joliet_1999")
  		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
 -		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
 +		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
  		x"romfs")
 -		    genromfs -V "$FSLABEL" -f "${FSIMAGES[0]}" -d "$MASTER" ;;
 +		    genromfs -V "$FSLABEL" -f "${FSIMAGEP}0.img" -d "$MASTER" ;;
  		xsquash4_*)
- 		    echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -comp "${fs/squash4_/}" -b $BLKSIZE
- 		    mksquashfs "$MASTER" "${FSIMAGEP}0.img" -comp "${fs/squash4_/}" -b $BLKSIZE ;;
 -		    echo mksquashfs "$MASTER" "${FSIMAGES[0]}" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE
 -		    mksquashfs "$MASTER" "${FSIMAGES[0]}" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;;
++		    echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE
++		    mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;;
  		x"bfs")
  		    sleep 1
  		    fusermount -u "$MNTPOINTRW"