Merge branch 'master' of https://github.com/void-linux/void-mklive

data/issue

@@ -15,8 +15,8 @@ To start the installation please type:
 and follow the on-screen instructions. To install additional software make
 sure to configure your network interface and then use:
 
-	- xbps-install(8) to install/update packages
-	- xbps-query(8) to query for package info
+	- xbps-install(1) to install/update packages
+	- xbps-query(1) to query for package info
 
 Thanks for using Void Linux.
 

installer.sh.in

@@ -1033,7 +1033,7 @@ failed to activate swap on $dev!\ncheck $LOG for errors." ${MSGBOXSIZE}
             ext4) MKFS="mke2fs -F -t ext4"; modprobe ext4 >$LOG 2>&1;;
             f2fs) MKFS="mkfs.f2fs"; modprobe f2fs >$LOG 2>&1;;
             vfat) MKFS="mkfs.vfat -F32"; modprobe vfat >$LOG 2>&1;;
-            xfs) MKFS="mkfs.xfs -f"; modprobe xfs >$LOG 2>&1;;
+            xfs) MKFS="mkfs.xfs -f -i sparse=0"; modprobe xfs >$LOG 2>&1;;
             esac
             TITLE="Check $LOG for details ..."
             INFOBOX "Creating filesystem $fstype on $dev for $mntpt ..." 8 60
@@ -1360,7 +1360,7 @@ menu() {
         DEFITEM="Keyboard"
     fi
 
-    if xbps-uhelper arch | grep '-musl$' > /dev/null; then
+    if xbps-uhelper arch | grep -qe '-musl$'; then
         DIALOG --default-item $DEFITEM \
             --extra-button --extra-label "Settings" \
             --title " Void Linux installation menu " \

mklive.sh.in

@@ -364,7 +364,7 @@ CURRENT_STEP=0
 STEP_COUNT=9
 [ -n "${INCLUDE_DIRECTORY}" ] && ((STEP_COUNT=STEP_COUNT+1))
 
-: ${SYSLINUX_DATADIR:="$VOIDHOSTDIR"/usr/share/syslinux}
+: ${SYSLINUX_DATADIR:="$VOIDHOSTDIR"/usr/lib/syslinux}
 : ${GRUB_DATADIR:="$VOIDHOSTDIR"/usr/share/grub}
 : ${SPLASH_IMAGE:=data/splash.png}
 : ${XBPS_INSTALL_CMD:=xbps-install}

mknet.sh.in

@@ -214,7 +214,7 @@ if [ ${bootloader_pkg} = "syslinux" ] ; then
     # some of this list is from trial and error.  Either way, this is the
     # minimum needed to get Void up and booting on metal from the network.
     for prog in pxelinux.0 ldlinux.c32 libcom32.c32 vesamenu.c32 libutil.c32 chain.c32 ; do
-        cp -v "$ROOTFS/usr/share/syslinux/$prog" "$BOOT_DIR"
+        cp -v "$ROOTFS/usr/lib/syslinux/$prog" "$BOOT_DIR"
     done
 
     # Lastly we need the default pxelinux config and the splash image.