diff --git a/data/void-vpkgs.conf b/data/void-vpkgs.conf deleted file mode 100644 index 24101be..0000000 --- a/data/void-vpkgs.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Default void configuration -# -virtualpkg=awk:gawk -virtualpkg=cron-daemon:dcron -virtualpkg=editor:nvi -virtualpkg=man:openbsd-man -virtualpkg=ntp-daemon:openntpd -virtualpkg=shell:dash -virtualpkg=smtp-server:opensmtpd diff --git a/mklive.sh.in b/mklive.sh.in index f78699d..90e3f1d 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -95,10 +95,6 @@ copy_void_keys() { cp keys/*.plist "$1"/var/db/xbps/keys } -copy_void_conf() { - install -Dm644 data/void-vpkgs.conf "$1"/usr/share/xbps.d/void-virtualpkgs.conf -} - copy_dracut_files() { mkdir -p "$1"/usr/lib/dracut/modules.d/01vmklive cp dracut/vmklive/* "$1"/usr/lib/dracut/modules.d/01vmklive/ @@ -110,15 +106,12 @@ copy_autoinstaller_files() { } install_prereqs() { - copy_void_conf "$VOIDHOSTDIR" XBPS_ARCH=$ARCH "$XBPS_INSTALL_CMD" -r "$VOIDHOSTDIR" ${XBPS_REPOSITORY} \ -c "$XBPS_HOST_CACHEDIR" -y $REQUIRED_PKGS [ $? -ne 0 ] && die "Failed to install required software, exiting..." } install_packages() { - copy_void_conf "$ROOTFS" - XBPS_ARCH=$BASE_ARCH "${XBPS_INSTALL_CMD}" -r "$ROOTFS" \ ${XBPS_REPOSITORY} -c "$XBPS_CACHEDIR" -yn $PACKAGE_LIST $INITRAMFS_PKGS [ $? -ne 0 ] && die "Missing required binary packages, exiting..."