disk-create.sh: dd mbr.bin from $SYSLINUXMBR

If not defined, SYSLINUXMBR is /usr/lib/syslinux/mbr/mbr.bin as in Debian GNU/Linux.

However, on travis-ci configuration, SYSLINUXMBR will be as expected in Ubuntu Trusty

	/usr/lib/syslinux/mbr.bin
This commit is contained in:
Giacomo Tesio 2017-02-15 00:48:49 +01:00
parent 40077daa88
commit b2db87ff26
1 changed files with 4 additions and 1 deletions

View File

@ -9,6 +9,9 @@ if [ "$JEHANNE" = "" ]; then
exit 1
fi
if [ "$SYSLINUXMBR" == "" ]; then
export SYSLINUXMBR=/usr/lib/syslinux/mbr/mbr.bin # GNU/Linux Debian way
fi
if [ "$SYSLINUXBIOS" == "" ]; then
export SYSLINUXBIOS=/usr/lib/syslinux/modules/bios/ # GNU/Linux Debian way
fi
@ -129,7 +132,7 @@ echo halt >> /srv/hjfs.cmd
sleep 20
EOF
syslinux --offset $((2048*512)) $DISK
dd bs=440 count=1 conv=notrunc if=/usr/lib/syslinux/mbr/mbr.bin of=$DISK
dd bs=440 count=1 conv=notrunc if=$SYSLINUXMBR of=$DISK
else
echo Root disk already exists: $DISK
fi