From 1ffa7e4900d4ab39d7de5e37123bdf443f3fe32f Mon Sep 17 00:00:00 2001 From: Noah Huppert Date: Sat, 12 Jan 2019 21:56:47 -0500 Subject: [PATCH 1/5] mklive.sh: fixed syslinux datadir value after pkg update --- mklive.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mklive.sh.in b/mklive.sh.in index dc102f2..1a160b7 100644 --- a/mklive.sh.in +++ b/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} From c45822d76599a604a7d3ba47480c7173ed8d1314 Mon Sep 17 00:00:00 2001 From: human Date: Sat, 12 Jan 2019 03:28:21 +0200 Subject: [PATCH 2/5] data/issue: fix manpage sections for xbps utils --- data/issue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/issue b/data/issue index 9117c72..1681e40 100644 --- a/data/issue +++ b/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. From bb38cc21a2f71d6ea9b76f4bf4760a176bd57540 Mon Sep 17 00:00:00 2001 From: huglovefan Date: Tue, 20 Nov 2018 14:21:32 +0200 Subject: [PATCH 3/5] installer.sh.in: fix check for *-musl arch --- installer.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer.sh.in b/installer.sh.in index 11d40cc..873c4bf 100644 --- a/installer.sh.in +++ b/installer.sh.in @@ -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 " \ From 2935dff0ce545a2bf7e1544bc6925325466ef288 Mon Sep 17 00:00:00 2001 From: voidanix <46201805+voidanix@users.noreply.github.com> Date: Thu, 27 Dec 2018 21:12:52 +0100 Subject: [PATCH 4/5] Allow GRUB to get installed on XFS roots --- installer.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer.sh.in b/installer.sh.in index 873c4bf..1fa366f 100644 --- a/installer.sh.in +++ b/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 From 75595006934bc6c7fde46e2c961187b0ed15d0fd Mon Sep 17 00:00:00 2001 From: Christian Poulwey Date: Mon, 21 Jan 2019 21:49:01 +0100 Subject: [PATCH 5/5] mknet: take syslinux files from /usr/lib --- mknet.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mknet.sh.in b/mknet.sh.in index ce9e7b6..3b73531 100644 --- a/mknet.sh.in +++ b/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.