add dwm, format xfce package list

Including a copy in void-packages turned out better solution.
Grep in image don't have required perl regexps, and getting
one that have make linting slower by order of magnitude.
Even if it was already there, simply using image is
unnecessarily slower.

This reverts commit 163a923529.

Dockerfile

@@ -1,5 +1,5 @@
 # 1) use alpine to generate a void environment
-FROM alpine:3.9 as stage0
+FROM alpine:3.12 as stage0
 ARG REPOSITORY=https://alpha.de.repo.voidlinux.org
 ARG ARCH=x86_64
 COPY keys/* /target/var/db/xbps/keys/
@@ -17,7 +17,6 @@ FROM scratch as stage1
 ARG REPOSITORY=https://alpha.de.repo.voidlinux.org
 ARG ARCH=x86_64
 ARG BASEPKG=base-minimal
-ARG ADDINS=
 COPY --from=stage0 /target /
 COPY keys/* /target/var/db/xbps/keys/
 RUN xbps-reconfigure -a && \
@@ -26,7 +25,7 @@ RUN xbps-reconfigure -a && \
     --repository=${REPOSITORY}/current \
     --repository=${REPOSITORY}/current/musl \
     -r /target \
-    ${BASEPKG} ${ADDINS}
+    ${BASEPKG}
 
 # 3) configure and clean up the final image
 FROM scratch

Makefile

@@ -41,7 +41,7 @@ COMPRESSOR_THREADS=2
 all: $(SCRIPTS)
 
 clean:
-	rm -v *.sh
+	-rm -f *.sh
 
 distdir-$(DATECODE):
 	mkdir -p distdir-$(DATECODE)
@@ -99,6 +99,6 @@ masterdir-all-print:
 masterdir-all: $(ALL_MASTERDIRS)
 
 masterdir-%:
-	$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* --build-arg ADDINS=spdx-licenses-list -t voidlinux/masterdir-$*:$(DATECODE) .
+	$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* -t voidlinux/masterdir-$*:$(DATECODE) .
 
 .PHONY: clean dist rootfs-all-print rootfs-all platformfs-all-print platformfs-all pxe-all-print pxe-all masterdir-all-print masterdir-all masterdir-push-all

README.md

@@ -46,9 +46,3 @@ Build an x86\_64 musl live image with packages stored in a local repository:
     # ./mklive.sh -a x86_64-musl -r /path/to/host/binpkgs
 
 See the usage output for more information :-)
-
-
-These scripts are in flux, if you want to build a duplicate of a
-production image, its not a bad idea to ping maldridge on IRC.  This
-message will be removed when this readme is replaced with complete
-documentation.

base-x64.packages

@@ -11,6 +11,9 @@ mdadm
 
 
 #USERLAND PACKAGES
+exfat-utils
+fuse-exfat
+wget
 NetworkManager
 nano
 vim

base-x64.sh

@@ -2,46 +2,57 @@
 echo "========================="
 echo "| BASE VOID x86_64    |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-#NONFREE=https://repo.voidlinux.eu/current/nonfree
+NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
+
 FILENAME="void-live-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
 BUILDDIR="$(pwd)/build"
 
-#shift $((OPTIND - 1))
+retry=0
+# Run mklive command with set architechure, repos and package list
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
 
-#: ${ARCH:=$(uname -m)}
+    ((retry++))
+    if [[ $retry -eq 2 ]];then
+        break
+    fi
 
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
         -p "$(grep '^[^#].' base-x64.packages)" \
-    -T "Void Linux Unofficial" \
+        -T "${DESKTOP}" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
     
+done
 
+# Make sure resulting ISO exists and sent error to webpage if not
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then   
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
 fi
 
+# Add iso file to checksum list
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 
 
 
-
+# Check if checksum file exists, send error to webpage if not
 if [ ! -f sha256sums.txt ];then
     echo "Missing checksum file, aborting!"
     echo "ERR=1" > error-status.txt
     exit 1
 fi
 
+# make sure build directory exists and create it if not
 if [ ! -d "${BUILDDIR}" ];then
     mkdir ${BUILDDIR}
 fi
 
+# Move the iso file to the build directory
 mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build

build-images.sh

@@ -1,17 +1,13 @@
 #!/bin/bash
-
+clear
 HTMLDIR="/var/www/voidbuilds.xyz/public"
 FILENAME="status.html"
 ISODIR="download"
 
 
-echo "checking for updates"
-xbps-install -Syu && xbps-install -yu
-
-
-
-
 mvImages(){
+# move image files to final destination
+
     PKGLISTDIR="package_lists"
 
     if [ ! -f sha256sums.txt ];then
@@ -39,10 +35,10 @@ mvImages(){
     cp cinnamon-x64.packages ${PKGLISTDIR}/cinnamon-x64.packages.txt
     cp e17-x64.packages ${PKGLISTDIR}/e17-x64.packages.txt
     cp mate-x64.packages ${PKGLISTDIR}/mate-x64.packages.txt
-    cp lxde-x64.packages ${PKGLISTDIR}/lxde-x64.packages.txt
+#    cp lxde-x64.packages ${PKGLISTDIR}/lxde-x64.packages.txt
     cp lxqt-x64.packages ${PKGLISTDIR}/lxqt-x64.packages.txt
     cp i3-x64.packages ${PKGLISTDIR}/i3-x64.packages.txt
-    #cp kde-x64.packages ${PKGLISTDIR}/kde-x64.packages.txt
+    cp kde-x64.packages ${PKGLISTDIR}/kde-x64.packages.txt
     #cp gnome-x64.packages ${PKGLISTDIR}/gnome-x64.packages.txt
     cp xfce-x64.packages ${PKGLISTDIR}/xfce-x64.packages.txt
 
@@ -52,7 +48,7 @@ mvImages(){
 }
 
 runBuilds(){
-    TOTAL="8"
+    TOTAL="9"
     ERR_FILE="error-status.txt"
 
     if [ -f "${ERR_FILE}" ];then
@@ -94,10 +90,7 @@ runBuilds(){
         echo "2/${TOTAL} completed at $(date +%T)</br></br>" >> ${HTMLDIR}/${FILENAME} 
     fi
 
-    #echo "Building Image: GNOME</br>" >> ${HTMLDIR}/${FILENAME}
+    
-    #echo " Building: Gnome Image..."
-    #sleep 1
-    #./gnome-x64.sh
 
     echo "Building Image: i3</br>" >> ${HTMLDIR}/${FILENAME}
     echo "Building: i3 image..."
@@ -192,6 +185,20 @@ runBuilds(){
         echo "8/${TOTAL} completed at $(date +%T) </br></br>" >> ${HTMLDIR}/${FILENAME}
     fi
 
+
+    echo "Building Image: DWM</br>" >> ${HTMLDIR}/${FILENAME}
+    echo "Building: DWM Image..."
+    sleep 1
+    ./dwm-x64.sh
+
+    if [ "$(cat ${ERR_FILE})" = "ERR=1" ];then
+        echo "<b style="color:red">Build failed for image: 'MATE', trying again at 00:00 MST</b></br>" >> ${HTMLDIR}/${FILENAME}
+        rm ${ERR_FILE}
+        ${0} -bl
+    else
+        echo "9/${TOTAL} completed at $(date +%T)</br></br>" >> ${HTMLDIR}/${FILENAME}
+    fi
+
     if [ ! -f sha256sums.txt ];then
         echo "sha manifest does not exist!"
     else
@@ -240,6 +247,7 @@ genSpecs(){
     echo "AMDGPU Version: $(xbps-query -R xf86-video-amdgpu| grep pkgver | sed 's/pkgver://')</br></br>" >> ${HTMLDIR}/${FILENAME}
     echo "</html>" >> ${HTMLDIR}/${FILENAME}
 }
+
 genHtml(){
     FILENAME="status.html"
 
@@ -253,7 +261,7 @@ genHtml(){
 	echo 'setTimeout("location.reload(true);",timeoutPeriod);' >> ${HTMLDIR}/${FILENAME}
     echo '}' >> ${HTMLDIR}/${FILENAME}
 
-    echo 'window.onload = timedRefresh(10000);' >> ${HTMLDIR}/${FILENAME}
+    echo 'window.onload = timedRefresh(60000);' >> ${HTMLDIR}/${FILENAME}
 	echo "</script>" >> ${HTMLDIR}/${FILENAME}
 	
 	echo "<style>" >> ${HTMLDIR}/${FILENAME}
@@ -268,7 +276,7 @@ genHtml(){
 
 	echo "</head>" >> ${HTMLDIR}/${FILENAME}
 	echo '<body text=white style="background-color: black">' >> ${HTMLDIR}/${FILENAME}
-	echo "<H5>This page will refresh every 10 seconds</H5></br>" >> ${HTMLDIR}/${FILENAME} 
+	echo "<H5>This page will refresh every 60 seconds</H5></br>" >> ${HTMLDIR}/${FILENAME} 
 
 	
 	echo "<H4 style="color:cyan">Build process initiated at:</H4> $(date +%R) MST  ($(date -u +%R)  UTC) on $(date +%D)" >> ${HTMLDIR}/${FILENAME}
@@ -294,26 +302,35 @@ genHtml(){
 }
 
 cleanUp(){
-
+# Clean: mklive xbps cache, build dir| Remove: old kernels, orphan packages
 
     BUILDDIR="build"
+
     echo "[Cleaning up...]"
     echo "Checking for local XBPS cache dir..."
+
     if [ -d xbps-cachedir-x86_64 ];then
         echo "Removing local XBPS cache dir"
         rm -r xbps-cachedir-x86_64/
     fi
+
     echo "Removing orphans..."
+
     xbps-remove -yo
+
     echo "Clearing system XBPS cache files..."
+
     tux c
+
     echo "Checking for unused image files..." 
+
     if [ "$(ls -A $BUILDDIR)" ];then
         echo "Removing unused image files.."
         rm build/*
     fi
 
     echo "Checking for and removing unused kernels..."
+
     vkpurge rm all
 
 }
@@ -333,10 +350,14 @@ case ${1} in
     done
 ;;
 
+-c|-clean)
+    cleanUp
+;;
 
 *)
-	echo -e "\nusage: ${0} [-bn, -bl]\n"
+	echo -e """\nusage: ${0} [-bn, -bl]\n
-    echo -e "\n-bn      run builds now, snooze after\n"
+    echo -e \n-bn      run builds now, snooze after\n
-    echo -e "-bl        snooze now, run builds after\n\n"
+    echo -e -bl        snooze now, run builds after\n"""
+    echo 
 ;;
 esac

build-x86-images.sh.in

@@ -29,7 +29,7 @@ readonly LXQT_IMG=void-live-${ARCH}-${DATE}-lxqt.iso
 readonly GRUB="grub-i386-efi grub-x86_64-efi"
 
 readonly BASE_PKGS="dialog cryptsetup lvm2 mdadm $GRUB"
-readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font dejavu-fonts-ttf alsa-plugins-pulseaudio intel-ucode"
+readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font dejavu-fonts-ttf alsa-plugins-pulseaudio"
 readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2 firefox-esr"
 readonly XFCE_PKGS="$X_PKGS lxdm xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
 readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"

cinnamon-x64.packages

@@ -12,7 +12,7 @@ mdadm
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
-intel-ucode
+#intel-ucode
 setxkbmap 
 xauth 
 font-misc-misc 
@@ -22,8 +22,14 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+gettext
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 lxdm
-pm-utils
 nano
 xdg-utils
 xdg-desktop-portal
@@ -44,7 +50,7 @@ vim
 dtrx
 unzip
 p7zip
-unrar
+#unrar
 bash-completion
 cinnamon
 xrandr
@@ -68,3 +74,4 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 firefox
+adwaita-icon-theme

cinnamon-x64.sh

@@ -3,32 +3,46 @@ DESKTOP="cinnamon"
 echo "========================="
 echo "| ${DESKTOP} VOID x86_64    |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
 FILENAME="void-live-${DESKTOP}-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
 BUILDDIR="$(pwd)/build"
 
-#shift $((OPTIND - 1))
+retry=0
 
-#: ${ARCH:=$(uname -m)}
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
+
+    ((retry++))
+    if [[ $retry -gt 2 ]];then
+        break
+    fi
     
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
         -T "Void Linux ${DESKTOP} Unofficial" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
+done
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 

dwm-x64.packages

@@ -7,16 +7,19 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
-intel-ucode
 setxkbmap 
-xrandr
 xauth
+xrandr
 font-misc-misc 
 terminus-font 
 dejavu-fonts-ttf 
@@ -24,24 +27,39 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+wget
 lxdm
-pm-utils
-bash-completion
 nano
+xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire
+gstreamer1-pipewire
+upower
+flatpak
 git
 vim
-lxde
+upower
-xdg-utils
+bash-completion
-gnome-terminal
+dwm
 alsa-utils
-pavucontrol
 xterm
+mc
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
-octoxbps
+dmenu
-gksu
+sakura
 void-repo-multilib
 gvfs-afc 
 gvfs-mtp 
@@ -50,4 +68,4 @@ udisks2
 ntfs-3g
 gnome-keyring
 network-manager-applet
-falkon
+qutebrowser

e17-x64.packages

@@ -13,7 +13,6 @@ xorg-minimal
 xorg-input-drivers 
 xorg-video-drivers
 xrandr
-intel-ucode
 setxkbmap 
 xauth 
 font-misc-misc 
@@ -23,6 +22,13 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+polkit-elogind
+exfat-utils
+fuse-exfat
+wget
 lxdm
 enlightenment
 terminology
@@ -44,7 +50,6 @@ upower
 flatpak
 zenity
 bash-completion
-pm-utils
 nano
 xdg-utils
 vim
@@ -56,6 +61,8 @@ pavucontrol
 xterm
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 void-repo-multilib
@@ -70,6 +77,5 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 firefox
-Adapta
-papirus-icon-theme
 gnome-themes-standard
+adwaita-icon-theme

gnome-x64.packages

@@ -27,8 +27,13 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 gdm
-pm-utils
 bash-completion
 nano
 git
@@ -72,3 +77,4 @@ gnome-apps
 Adapta
 papirus-icon-theme
 gnome-themes-standard
+adwaita-icon-theme

gnome-x64.sh

@@ -3,31 +3,43 @@ DESKTOP="gnome"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-#NONFREE=https://repo.voidlinux.eu/current/nonfree
+#NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
 FILENAME="void-live-${DESKTOP}-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
 BUILDDIR="$(pwd)/build"
 
-#shift $((OPTIND - 1))
+retry=0
-
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
-#: ${ARCH:=$(uname -m)}
+    ((retry++))
-
+    if [[ $retry -gt 2 ]];then
+        break
+    fi
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
         -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
         -T "Void Linux ${DESKTOP} Unofficial" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
+done
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 

i3-x64.packages

@@ -9,10 +9,14 @@ lvm2
 mdadm 
 
 # X PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
-intel-ucode
 setxkbmap 
 xauth
 xrandr
@@ -23,8 +27,8 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+wget
 lxdm
-pm-utils
 nano
 xdg-utils
 xdg-desktop-portal
@@ -54,6 +58,8 @@ xterm
 mc
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 dmenu
@@ -67,3 +73,4 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 qutebrowser
+adwaita-icon-theme

i3-x64.sh

@@ -3,32 +3,45 @@ DESKTOP="i3"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
 FILENAME="void-live-${DESKTOP}-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
 BUILDDIR="$(pwd)/build"
 
-#shift $((OPTIND - 1))
+retry=0
 
-#: ${ARCH:=$(uname -m)}
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
+    ((retry++))
+    if [[ $retry -gt 2 ]];then
+        break
+    fi
 
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
         -T "Void Linux ${DESKTOP} Unofficial" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
+done
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 

installer.sh.in

@@ -485,8 +485,15 @@ menu_partitions() {
     if [ $? -eq 0 ]; then
         local device=$(cat $ANSWER)
 
+        DIALOG --title " Select the software for partitioning " \
+            --menu "$MENULABEL" ${MENUSIZE} \
+            "cfdisk" "Easy to use" \
+            "fdisk" "More advanced"
+        if [ $? -eq 0 ]; then
+            local software=$(cat $ANSWER)
+
             DIALOG --title "Modify Partition Table on $device" --msgbox "\n
-${BOLD}cfdisk will be executed in disk $device.${RESET}\n\n
+${BOLD}${software} will be executed in disk $device.${RESET}\n\n
 For BIOS systems, MBR or GPT partition tables are supported.\n
 To use GPT on PC BIOS systems an empty partition of 1MB must be added\n
 at the first 2GB of the disk with the TOGGLE \`bios_grub' enabled.\n
@@ -500,13 +507,14 @@ ${BOLD}WARNING: /usr is not supported as a separate partition.${RESET}\n
 ${RESET}\n" 18 80
             if [ $? -eq 0 ]; then
                 while true; do
-                clear; cfdisk $device; PARTITIONS_DONE=1
+                    clear; $software $device; PARTITIONS_DONE=1
                     break
                 done
             else
                 return
             fi
         fi
+    fi
 }
 
 menu_keymap() {

kde-x64.packages

@@ -22,10 +22,14 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
 sddm
 konsole
 bash-completion
-pm-utils
 nano
 git
 vim
@@ -52,11 +56,12 @@ inetutils
 usbutils
 wget
 curl
+dtrx
+p7zip
 xterm
 htop
 tuxc
 topgrade
-keepassxc
 octoxbps
 ntp
 void-repo-multilib
@@ -78,4 +83,4 @@ kaccounts-integration
 kaccounts-providers
 dolphin
 adapta-kde
-papirus-icon-theme
+adwaita-icon-theme

kde-x64.sh

@@ -3,9 +3,9 @@ DESKTOP="kde"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-#NONFREE=https://repo.voidlinux.eu/current/nonfree
+NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
 FILENAME="void-live-${DESKTOP}-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
@@ -15,19 +15,37 @@ BUILDDIR="$(pwd)/build"
 
 #: ${ARCH:=$(uname -m)}
 
+retry=0
+
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
+    ((retry++))
+    if [[ $retry -gt 2 ]];then
+        break
+    fi
+
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
         -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
         -T "Void Linux ${DESKTOP} Unofficial" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
+done
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 

lib.sh.in

@@ -58,6 +58,10 @@ mount_pseudofs() {
             mount -r --bind /$f "$ROOTFS/$f"
         fi
     done
+    if ! mountpoint -q "$ROOTFS/tmp" ; then
+        mkdir -p "$ROOTFS/tmp"
+        mount -o mode=0755,nosuid,nodev -t tmpfs tmpfs "$ROOTFS/tmp"
+    fi
 }
 
 umount_pseudofs() {
@@ -71,6 +75,7 @@ umount_pseudofs() {
             umount -f "$ROOTFS/$f" >/dev/null 2>&1
         done
     fi
+    umount -f "$ROOTFS/tmp" >/dev/null 2>&1
 }
 
 run_cmd_target() {
@@ -237,7 +242,7 @@ register_binfmt() {
     # use the static one always and make sure it shows up at the same
     # place in the host and the chroot.
     if [ ! -x "$ROOTFS/usr/bin/$QEMU_BIN" ] ; then
-        cp -f "$(which "$QEMU_BIN")" "$ROOTFS/usr/bin" ||
+        install -m755 -D "$(which "$QEMU_BIN")" "$ROOTFS/usr/bin/$QEMU_BIN" ||
             die "Could not install $QEMU_BIN to $ROOTFS/usr/bin/"
     fi
 }
@@ -263,6 +268,7 @@ set_target_arch_from_platform() {
         i686*) XBPS_TARGET_ARCH="i686";;
         x86_64*) XBPS_TARGET_ARCH="x86_64";;
         GCP*) XBPS_TARGET_ARCH="x86_64";;
+        pinebookpro*) XBPS_TARGET_ARCH="aarch64";;
         *) die "$PROGNAME: Unable to compute target architecture from platform";;
     esac
 

lxde-x64.packages

@@ -24,6 +24,12 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 lxdm
 pm-utils
 bash-completion
@@ -64,3 +70,4 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 falkon
+adwaita-icon-theme

lxde-x64.sh

@@ -18,17 +18,26 @@ BUILDDIR="$(pwd)/build"
 sudo ./mklive.sh \
     -a x86_64 \
     -r ${CURRENT} \
-    -r ${MUTILIB} \
+#    -r ${MUTILIB} \
     -r ${NONFREE} \
     -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
     -T "Void Linux ${DESKTOP} Unofficial" \
     -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 

lxqt-x64.packages

@@ -7,14 +7,12 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
 xrandr
-intel-ucode
 setxkbmap 
 xauth 
 font-misc-misc 
@@ -24,8 +22,13 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 qt5-plugin-sqlite
-pm-utils
 nano
 bash-completion
 git
@@ -52,6 +55,8 @@ pavucontrol
 xterm
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 octoxbps
@@ -65,3 +70,5 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 falkon
+papirus-icon-theme
+adwaita-icon-theme

lxqt-x64.sh

@@ -3,33 +3,45 @@ DESKTOP="lxqt"
 echo "========================="
 echo "| ${DESKTOP} VOID x86_64    |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
 FILENAME="void-live-${DESKTOP}-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
 BUILDDIR="$(pwd)/build"
 
-#shift $((OPTIND - 1))
+retry=0
 
-#: ${ARCH:=$(uname -m)}
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
+    ((retry++))
+    if [[ $retry - gt 2 ]];then
+        break
+    fi
 
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
         -T "Void Linux ${DESKTOP} Unofficial" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
-
+done
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 

mate-x64.packages

@@ -7,13 +7,11 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
-intel-ucode
 setxkbmap 
 xauth 
 xrandr
@@ -24,6 +22,14 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+linux-firmware-network
+gparted
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 lxdm
 mate
 mate-extra
@@ -49,6 +55,8 @@ alsa-plugins-pulseaudio
 xterm
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 octoxbps
@@ -62,3 +70,5 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 firefox
+Adapta
+adwaita-icon-theme

mate-x64.sh

@@ -11,25 +11,37 @@ DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
 BUILDDIR="$(pwd)/build"
 
-#shift $((OPTIND - 1))
+retry=0
 
-#: ${ARCH:=$(uname -m)}
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
+    ((retry++))
+    if [[ $retry -gt 2 ]];then
+        break
+    fi
 
-   ./mklive.sh \
+    sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
         -T "Void Linux ${DESKTOP} Unofficial" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
-
+done
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt
 

mkimage.sh.in

@@ -143,7 +143,7 @@ fi
 
 # Be absolutely certain the platform is supported before continuing
 case "$PLATFORM" in
-    bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|usbarmory|GCP|*-musl);;
+    bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|usbarmory|GCP|pinebookpro|*-musl);;
     *) die "The $PLATFORM is not supported, exiting..."
 esac
 
@@ -165,6 +165,17 @@ if [ "$BOOT_FSTYPE" = "vfat" ]; then
     _args="-I -F16"
 fi
 
+BOOT_START=2048
+ROOT_START=
+case "$PLATFORM" in
+    pinebookpro*)
+        BOOT_START=32768
+        # Without this, sfdisk creates root partition starting at
+        # 2048, overlapping u-boot reserved space and boot partition.
+        ROOT_START=$BOOT_START
+        ;;
+esac
+
 case "$PLATFORM" in
     cubieboard2|cubietruck|ci20*|odroid-c2*)
         # These platforms use a single partition for the entire filesystem.
@@ -184,8 +195,8 @@ _EOF
         # layout for new platforms.
         sfdisk "${FILENAME}" <<_EOF
 label: dos
-2048,${BOOT_FSSIZE},b,*
+${BOOT_START},${BOOT_FSSIZE},b,*
-,+,L
+${ROOT_START},+,L
 _EOF
         LOOPDEV=$(losetup --show --find --partscan "$FILENAME")
         # Normally we need to quote to prevent argument splitting, but
@@ -247,6 +258,10 @@ if [ -n "$BOOT_UUID" ]; then
     echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults${fstab_args} 0 2" >> "${ROOTFS}/etc/fstab"
 fi
 
+# Images are shipped with root as the only user by default, so we need to
+# ensure ssh login is possible for headless setups.
+sed -i "${ROOTFS}/etc/ssh/sshd_config" -e 's|^#\(PermitRootLogin\) .*|\1 yes|g'
+
 # This section does final configuration on the images.  In the case of
 # SBCs this writes the bootloader to the image or sets up other
 # required binaries to boot.  In the case of images destined for a
@@ -278,6 +293,12 @@ ci20*)
     dd if="${ROOTFS}/boot/u-boot-spl.bin" of="${LOOPDEV}" obs=512 seek=1 >/dev/null 2>&1
     dd if="${ROOTFS}/boot/u-boot.img" of="${LOOPDEV}" obs=1K seek=14 >/dev/null 2>&1
     ;;
+pinebookpro*)
+    dd if="${ROOTFS}/boot/idbloader.img" of="${LOOPDEV}" seek=64 conv=notrunc,fsync >/dev/null 2>&1
+    dd if="${ROOTFS}/boot/u-boot.itb" of="${LOOPDEV}" seek=16384 conv=notrunc,fsync >/dev/null 2>&1
+    run_cmd_chroot "${ROOTFS}" "xbps-reconfigure -f pinebookpro-kernel"
+    cleanup_chroot
+    ;;
 GCP*)
     # Google Cloud Platform image configuration for Google Cloud
     # Engine.  The steps below are built in reference to the

mkplatformfs.sh.in

@@ -51,7 +51,7 @@ Usage: $PROGNAME [options] <platform> <base-tarball>
 Supported platforms: i686, x86_64, GCP,
                      dockstar, bananapi, beaglebone, cubieboard2, cubietruck,
                      odroid-c2, odroid-u2, rpi, rpi2 (armv7), rpi3 (aarch64),
-                     usbarmory, ci20, pogoplugv4
+                     usbarmory, ci20, pogoplugv4, pinebookpro
 
 Options
     -b <syspkg> Set an alternative base-system package (defaults to base-system)
@@ -61,6 +61,7 @@ Options
     -C <file>   Full path to the XBPS configuration file
     -r <repo>   Set XBPS repository (may be set multiple times)
     -x <num>    Use <num> threads to compress the image (dynamic if unset)
+    -o <file>   Filename to write the PLATFORMFS archive to
     -n          Do not compress the image, instead print out the rootfs directory
     -h          Show this help
     -V          Show version
@@ -74,15 +75,16 @@ _EOF
 BASEPKG=base-system
 COMPRESSION="y"
 
-while getopts "b:p:k:c:C:r:x:nhV" opt; do
+while getopts "b:p:k:c:C:r:x:o:nhV" opt; do
     case $opt in
         b) BASEPKG="$OPTARG" ;;
         p) EXTRA_PKGS="$OPTARG" ;;
         k) POST_CMD="$OPTARG" ;;
         c) XBPS_CACHEDIR="--cachedir=$OPTARG" ;;
         C) XBPS_CONFFILE="-C $OPTARG" ;;
-        r) XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=$OPTARG" ;;
+        r) XBPS_REPOSITORY="--repository=$OPTARG $XBPS_REPOSITORY" ;;
         x) COMPRESSOR_THREADS="$OPTARG" ;;
+        o) FILENAME="$OPTARG" ;;
         n) COMPRESSION="n" ;;
         h) usage; exit 0 ;;
         V) echo "$PROGNAME @@MKLIVE_VERSION@@"; exit 0 ;;
@@ -125,6 +127,7 @@ case "$PLATFORM" in
     i686*) PKGS="$BASEPKG" ;;
     x86_64*) PKGS="$BASEPKG" ;;
     GCP*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
+    pinebookpro*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     *) die "$PROGNAME: invalid platform!";;
 esac
 
@@ -157,7 +160,7 @@ tar xf "$BASE_TARBALL" -C "$ROOTFS"
 # $PKGS.  After this step we will do an xbps-reconfigure -f $PKGS
 # under the correct architecture to ensure the system is setup
 # correctly.
-run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $PKGS"
+run_cmd_target "xbps-install -SU $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $PKGS"
 
 # Now that the packages are installed, we need to chroot in and
 # reconfigure.  This needs to be done as the right architecture.
@@ -222,7 +225,7 @@ fi
 if [ "$COMPRESSION" = "y" ]; then
     # Finally we can compress the tarball, the name will include the
     # platform and the date on which the tarball was built.
-    tarball=void-${PLATFORM}-PLATFORMFS-$(date '+%Y%m%d').tar.xz
+    tarball=${FILENAME:-void-${PLATFORM}-PLATFORMFS-$(date '+%Y%m%d').tar.xz}
     run_cmd "tar -cp --posix --xattrs -C $ROOTFS . | xz -T${COMPRESSOR_THREADS:-0} -9 > $tarball "
 
     # Now that we have the tarball we don't need the rootfs anymore, so we

mkrootfs.sh.in

@@ -136,15 +136,17 @@ run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -
 # so we set this here.
 chmod 755 "$ROOTFS"
 
-# The pseudofs mountpoints are needed for the qemu support in cases
+# The binfmt setup and pseudofs mountpoints are needed for the qemu
-# where we are running things that aren't natively executable.
+# support in cases where we are running things that aren't natively
+# executable.
+register_binfmt
 mount_pseudofs
 
 # With everything setup, we can now run the install to load the
 # system package into the rootfs.  This will not produce a
 # bootable system but will instead produce a base component that can
 # be quickly expanded to perform other actions on.
-run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $SYSPKG"
+run_cmd_target "xbps-install -SU $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $SYSPKG"
 
 # Enable en_US.UTF-8 locale and generate it into the target ROOTFS.
 # This is a bit of a hack since some glibc stuff doesn't really work

package_lists/base-x64.packages.txt

@@ -7,11 +7,13 @@ dialog
 cryptsetup 
 lvm2 
 mdadm
-ConsoleKit2
 
 
 
 #USERLAND PACKAGES
+exfat-utils
+fuse-exfat
+wget
 NetworkManager
 nano
 vim

package_lists/cinnamon-x64.packages.txt

@@ -7,13 +7,12 @@ dialog
 cryptsetup 
 lvm2 
 mdadm
-ConsoleKit2
 
 # X PACKAGES
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
-intel-ucode
+#intel-ucode
 setxkbmap 
 xauth 
 font-misc-misc 
@@ -23,16 +22,35 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+gettext
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 lxdm
-pm-utils
 nano
 xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire
+gstreamer1-pipewire
+upower
+flatpak
 git
 vim
 dtrx
 unzip
 p7zip
-unrar
+#unrar
 bash-completion
 cinnamon
 xrandr
@@ -56,3 +74,4 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 firefox
+adwaita-icon-theme

package_lists/e17-x64.packages.txt

@@ -7,14 +7,12 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
 xrandr
-intel-ucode
 setxkbmap 
 xauth 
 font-misc-misc 
@@ -24,14 +22,34 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+polkit-elogind
+exfat-utils
+fuse-exfat
+wget
 lxdm
 enlightenment
 terminology
 econnman
+upower
 xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire
+gstreamer1-pipewire
+upower
+flatpak
 zenity
 bash-completion
-pm-utils
 nano
 xdg-utils
 vim
@@ -43,6 +61,8 @@ pavucontrol
 xterm
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 void-repo-multilib
@@ -57,6 +77,5 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 firefox
-Adapta
-papirus-icon-theme
 gnome-themes-standard
+adwaita-icon-theme

package_lists/i3-x64.packages.txt

@@ -7,13 +7,16 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
-intel-ucode
 setxkbmap 
 xauth
 xrandr
@@ -24,12 +27,26 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+wget
 lxdm
-pm-utils
 nano
 xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire
+gstreamer1-pipewire
+upower
+flatpak
 git
 vim
+upower
 bash-completion
 i3-gaps
 i3blocks
@@ -41,6 +58,8 @@ xterm
 mc
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 dmenu
@@ -54,3 +73,4 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 qutebrowser
+adwaita-icon-theme

package_lists/kde-x64.packages.txt

@@ -0,0 +1,86 @@
+#GRUB
+grub-i386-efi
+grub-x86_64-efi
+
+#BASE PKGS
+dialog 
+cryptsetup 
+lvm2 
+mdadm 
+
+# X PACKAGES
+xorg
+xorg-input-drivers 
+xorg-video-drivers
+setxkbmap 
+xauth 
+xrandr
+font-misc-misc 
+terminus-font 
+dejavu-fonts-ttf 
+alsa-plugins-pulseaudio
+
+
+#USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+sddm
+konsole
+bash-completion
+nano
+git
+vim
+xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire 
+gstreamer1-pipewire
+upower
+flatpak
+alsa-utils
+alsa-plugins-pulseaudio
+plasma-pa
+paprefs
+pavucontrol
+inetutils
+usbutils
+wget
+curl
+dtrx
+p7zip
+xterm
+htop
+tuxc
+topgrade
+octoxbps
+ntp
+void-repo-multilib
+void-repo-nonfree
+octoxbps
+kdesu
+gvfs-afc 
+gvfs-mtp 
+gvfs-smb 
+udisks2 
+ntfs-3g
+gnome-keyring
+NetworkManager
+plasma-nm
+firefox
+kde5
+kde5-baseapps
+kaccounts-integration
+kaccounts-providers
+dolphin
+adapta-kde
+adwaita-icon-theme

package_lists/lxqt-x64.packages.txt

@@ -7,14 +7,12 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
 xrandr
-intel-ucode
 setxkbmap 
 xauth 
 font-misc-misc 
@@ -24,12 +22,30 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 qt5-plugin-sqlite
-pm-utils
 nano
 bash-completion
 git
 xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire
+gstreamer1-pipewire
+upower
+flatpak
 vim
 lxdm
 lxqt
@@ -39,6 +55,8 @@ pavucontrol
 xterm
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 octoxbps
@@ -52,3 +70,5 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 falkon
+papirus-icon-theme
+adwaita-icon-theme

package_lists/mate-x64.packages.txt

@@ -7,13 +7,11 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
-intel-ucode
 setxkbmap 
 xauth 
 xrandr
@@ -24,6 +22,14 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+linux-firmware-network
+gparted
+elogind
+dbus-elogind
+dbus-elogind-x11
+exfat-utils
+fuse-exfat
+wget
 lxdm
 mate
 mate-extra
@@ -31,11 +37,26 @@ bash-completion
 caja-extensions
 alsa-utils
 xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire
+gstreamer1-pipewire
+upower
+flatpak
 pavucontrol
 alsa-plugins-pulseaudio
 xterm
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 octoxbps
@@ -49,3 +70,5 @@ ntfs-3g
 gnome-keyring
 network-manager-applet
 firefox
+Adapta
+adwaita-icon-theme

package_lists/xfce-x64.packages.txt

@@ -7,14 +7,12 @@ dialog
 cryptsetup 
 lvm2 
 mdadm 
-ConsoleKit2
 
 # X PACKAGES
 xorg-minimal 
 xorg-input-drivers 
 xorg-video-drivers
 xrandr
-intel-ucode
 setxkbmap 
 xauth 
 font-misc-misc 
@@ -24,11 +22,32 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+adwaita-icon-theme
+linux-firmware-network
+gparted
+exfat-utils
+elogind
+dbus-elogind
+dbus-elogind-x11
+fuse-exfat
+wget
 lxdm
 xdg-utils
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-kde
+xdg-user-dirs
+xdg-user-dirs-gtk
+libappindicator
+AppStream
+libvdpau-va-gl 
+vdpauinfo
+pipewire
+gstreamer1-pipewire
+upower
+flatpak
 zenity
 bash-completion
-pm-utils
 nano
 xdg-utils
 vim
@@ -40,6 +59,8 @@ pavucontrol
 xterm
 htop
 tuxc
+dtrx
+p7zip
 topgrade
 ntp
 void-repo-multilib
@@ -57,5 +78,4 @@ firefox
 xfce4 
 xfce4-plugins
 Adapta
-papirus-icon-theme
 gnome-themes-standard

sha256sums.txt

@@ -1,65 +0,0 @@
-8915aaebde94fd0f63f36a00e5863c88d43317995bf52463b975f9c781ba4695  void-live-unofficial-x86_64-5.3.10_1-20191112.iso
-d20bb0a17d2db34f99dfa8a6bef31de121de1f0d26e1a576f812887cc3832ba6  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191112.iso
-5fff810f1c6e91d633b77e40ce93c6856cd6d8f30982bcb9b09803606938d466  void-live-i3-unofficial-x86_64-5.3.10_1-20191112.iso
-a4bb97050636ae8bcaf4c111e2e08cd1c38c08142dde9b1be7f0e3ef30a15415  void-live-e17-unofficial-x86_64-5.3.10_1-20191112.iso
-2a1514b1e229c28c96683b74d1d36cd74b90d67bf8413e0aa043f9fe405135d2  void-live-kde-unofficial-x86_64-5.3.10_1-20191112.iso
-f64de572111dbac668578a347ed39f5d6e970f527117118fe7681bdaa1ced16f  void-live-lxde-unofficial-x86_64-5.3.10_1-20191112.iso
-a557acf23f338b070959ae9e7f0a20bb7dbb83684aeed2ca098c2ed7212c3ff5  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191112.iso
-c5317a197965a6694e0734c8ccff441baeff9bf467f5f948a93a08aabb575fbf  void-live-mate-unofficial-x86_64-5.3.10_1-20191112.iso
-9346a09ee680e12c5b21bb50f35f06cbfa51fd4cb5caa31ced1b2fae788b1465  void-live-unofficial-x86_64-5.3.10_1-20191113.iso
-ccfeb30d3b69799a1707685c06bff6bad8cf5a1984cd49649297a93ad88a41c2  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191113.iso
-7b07da99b650dd9947414e5431c6f112fc68e12bc581ae5d0abfec07da87d4e0  void-live-i3-unofficial-x86_64-5.3.10_1-20191113.iso
-aab045385ce946b032251338a83d34aacf3fdd4c55f182254250c53f481693db  void-live-e17-unofficial-x86_64-5.3.10_1-20191113.iso
-2d90ede9858fee8b2c85a52339ac058f88d827b4626686f223ad6575ebdeb175  void-live-kde-unofficial-x86_64-5.3.10_1-20191113.iso
-04e2bc456bfd18e18c7545de6cf15b363a00e0633a69c2fa801cb3b5d8ad29c0  void-live-lxde-unofficial-x86_64-5.3.10_1-20191113.iso
-09352e87b7f45f9e3f3c47a48f1d771f5dab77f6fc7e8903ee3a7b54a20aae48  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191113.iso
-2ddf3253dd4647a4214fb822f791a2df4e8e1f44b6c090255e08f18ae7ae88f9  void-live-mate-unofficial-x86_64-5.3.10_1-20191113.iso
-0daec0a7a698f5925b67f4a0fce6d8684a933c5329f0227ea78e862e5395d459  void-live-unofficial-x86_64-5.3.10_1-20191114.iso
-95ca4307494f135828f5129fea604cec276cf4abc2031694ce9f478e47ae2c49  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191114.iso
-d66026192e78270ff20eb06fc5937cf44ae55fa626a16a6d963c2e83bcddd718  void-live-i3-unofficial-x86_64-5.3.10_1-20191114.iso
-f8002c79224e93141145dabd614f48327ab1b059969d51e8d45bb052d855a321  void-live-e17-unofficial-x86_64-5.3.10_1-20191114.iso
-cbd6076ba902f0b5ace34410a6b78888130f5a2aa026123377777c2b240f0034  void-live-kde-unofficial-x86_64-5.3.10_1-20191114.iso
-6e914505f22d1adee83d72b1c597bc8c7f782ee7bb4909f00b1e959c0d350a49  void-live-lxde-unofficial-x86_64-5.3.10_1-20191114.iso
-569ddb437e2d35d787fb3207e9a85f33f8cda96ab06a7ff834babb58f421a063  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191114.iso
-8e745760fb4bd85528100f25ccbd49fa6ffdb03e4aca64c544dd3acb04d51ebb  void-live-mate-unofficial-x86_64-5.3.10_1-20191114.iso
-83bbeccaf0ffe9238d0ece253816be30a7ebf98a2366bd508bbc34eac4dfb4df  void-live-unofficial-x86_64-5.3.10_1-20191115.iso
-5a571b0b0196ff42c688e51487833409e4682249b07d8b9aa78f86dc00f2675a  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191115.iso
-3f8728561170bdc849df13d2c13b73c1decd65db17f2577105ea670906b3a77d  void-live-i3-unofficial-x86_64-5.3.10_1-20191115.iso
-1c5fabf99419c18334798e85baa6b56caf521fad152b4cc5a12293799c9446fa  void-live-e17-unofficial-x86_64-5.3.10_1-20191115.iso
-886cb486053dfac1b0a8d7449ae498f6485f46994b974f846739d1e3df35abaa  void-live-kde-unofficial-x86_64-5.3.10_1-20191115.iso
-861e65b4c3a66e7cad1218dbab5636cc50e447db6fd3836c85357821e0243828  void-live-lxde-unofficial-x86_64-5.3.10_1-20191115.iso
-71738a3f3ab39108a5630e45888fc903b3ee5389913142f77194205f674b1b10  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191115.iso
-75ae7c3861421d0658e08f8ff173e49b1a2c82ef43da84ad1d38c95ad6248b3f  void-live-mate-unofficial-x86_64-5.3.10_1-20191115.iso
-9e34442153ec7887ea757b8561a67405a77ee508435075d81feb58211d474b15  void-live-unofficial-x86_64-5.3.10_1-20191115.iso
-98fd0c62094ff9f23e273db2311ce4449361bfeda0fbf05abddd670dd3e96701  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191115.iso
-4b73e0929904c54bbba526ce0069759d5acaf9edba9488dd51b68ae9e5f9baf7  void-live-i3-unofficial-x86_64-5.3.10_1-20191115.iso
-8b57f7ec0de614e78a1b0eb267f9063af1618f3045345a78f94abeabf286083d  void-live-e17-unofficial-x86_64-5.3.10_1-20191115.iso
-3ad03d0fd7f94297c836f711a61f41e9f83f4df23d5641567ae5a034c3f67c92  void-live-kde-unofficial-x86_64-5.3.10_1-20191115.iso
-fd732aaac01f1ec1ab7ca716fca9c3ba71ddd3c28613277ed7ebaa2c850ab167  void-live-lxde-unofficial-x86_64-5.3.10_1-20191115.iso
-7fc926e296446501aa59744fb328f156abf53ac282b2b23941bcbcb44920d879  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191115.iso
-08e12b176ae05effc0f45f75a7b7521c5b3d70dea1d3ca611ed82741050944e2  void-live-mate-unofficial-x86_64-5.3.10_1-20191115.iso
-1600c0b3fbc97495e468bbcda621a6986d3a303a2131c79b79c118b3b4cd5394  void-live-unofficial-x86_64-5.3.10_1-20191116.iso
-59d9b18b96d5d0cac173435608c17c6a669f22e06c8ba4c10bdf84f845257944  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191116.iso
-d9a941a9b0480948266c09f91af869fe3e4628c352f402881cc49255bd94461c  void-live-i3-unofficial-x86_64-5.3.10_1-20191116.iso
-b042740d5d6de7b0214d1df2334371f8b5396e0dcd230ba81b65f6bcf99d8060  void-live-e17-unofficial-x86_64-5.3.10_1-20191116.iso
-593d0a603f3c8fd2404f7977f366553e05c17f8886c57ea806720cec81b4a06c  void-live-kde-unofficial-x86_64-5.3.10_1-20191116.iso
-c4afc82e6ee28bd41350d3845da1aef23369bdce0dc9b7b9b8821855a8d9bdab  void-live-lxde-unofficial-x86_64-5.3.10_1-20191116.iso
-7dd101f1f20ad5d5250c7e4edb2aeff67db337928d4b3e36eebab99458873364  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191116.iso
-7b07dc1fcdf72f3b11b3ae0e481eb8fa6c1e4e4d5597b42d1a6989c1b3a7d04f  void-live-mate-unofficial-x86_64-5.3.10_1-20191116.iso
-3d6e58129563b5da3ae0b543847e1c3e55c2668cde75ccbd92826095cf627025  void-live-unofficial-x86_64-5.3.10_1-20191117.iso
-d59d1f76cc3d44bd10dae5c274dadb110611fe45b00ae48195f6c7f7c4cdbe11  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191117.iso
-01e0386c8c31bd7277bfc4c788b0b4dcb9a9eeb018dd813236986af24dd97649  void-live-i3-unofficial-x86_64-5.3.10_1-20191117.iso
-aaa6f99229ec369a4b9220be687b3f1b14d6e5fe0018065bc8bc5a627853e4a9  void-live-e17-unofficial-x86_64-5.3.10_1-20191117.iso
-32d62e1ce465180875e8f694179272fd4876967b128db9747ac7989b048a44c8  void-live-kde-unofficial-x86_64-5.3.10_1-20191117.iso
-e15e3a6ebb09fb8b8b6dd8668a1fa9a14c5ffee9ddd5bdd3b28533b35b221856  void-live-lxde-unofficial-x86_64-5.3.10_1-20191117.iso
-d2f18e39de65d2474395322c27dc5403a2c13d97db5043af6de3d306d4605b29  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191117.iso
-21bbafea954760ce28c8d3212cdf62fc924313ac59b9d1ea0f85ebae96c4fe6f  void-live-mate-unofficial-x86_64-5.3.10_1-20191117.iso
-65c5e72988fc1ad6bb7d7893b4f8d3b631e3c61b53ccd5d71027beda95d81626  void-live-unofficial-x86_64-5.3.10_1-20191117.iso
-91faddf52fdaeaf7c933cbc39ea5ca0494ba8edc1ac6e7d81fa95e03e77be41d  void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191117.iso
-3da94ba1c032a0f96be1e093cb1239818c12e5b2d308142f27669792c98ba56b  void-live-i3-unofficial-x86_64-5.3.10_1-20191117.iso
-04c64f367e8372d9fad9dc37c7338cf961dbb90628060ff025a9b3a32c89f67a  void-live-e17-unofficial-x86_64-5.3.10_1-20191117.iso
-96ea55586c97df406fc1284db84a75517a358dcac1e2ddaa6b58290180245d4d  void-live-kde-unofficial-x86_64-5.3.10_1-20191117.iso
-8266c35162fdd8ca5d2187650a35d9e73cb4383b790b810e01b7f7ba1b6d60db  void-live-lxde-unofficial-x86_64-5.3.10_1-20191118.iso
-b528d0d938b1ac173bd72be13764cb58ef29b2c7755e804b1eb054ead6985096  void-live-lxqt-unofficial-x86_64-5.3.10_1-20191118.iso
-3392f911fa4b1f9d09541fac0bd16228e70b7b1a4696d00e3594546065ed7b0a  void-live-mate-unofficial-x86_64-5.3.10_1-20191118.iso
-3830cda09b0bdb793a4833f9a071b09d14d91b151f70ff6a07c758835f8f3bfb  void-live-unofficial-x86_64-5.3.10_1-20191119.iso

xfce-x64.packages

@@ -7,24 +7,45 @@ dialog
     cryptsetup 
     lvm2 
     mdadm 
-ConsoleKit2
 
-# X PACKAGES
+# XORG PACKAGES
     xorg-minimal 
     xorg-input-drivers 
     xorg-video-drivers
     xrandr
-intel-ucode
     setxkbmap 
     xauth
+    vdpauinfo
+    libvdpau-va-gl
     font-misc-misc 
     terminus-font 
     dejavu-fonts-ttf
+    dbus-elogind-x11
+    
+
+# KERNAL
+    linux-firmware-network
+
+
+# SOUND
     alsa-plugins-pulseaudio
+    paprefs
+    pavucontrol
+    pipewire
+    alsa-utils
+    gstreamer1-pipewire
+
+# NETWORK
+    NetworkManager
+    network-manager-applet
+    ntp
+    wget
     
 
-#USERLAND PACKAGES
+# DESKTOP ENVIRONMENT
     lxdm
+    xfce4 
+    xfce4-plugins
     xdg-utils
     xdg-desktop-portal
     xdg-desktop-portal-gtk
@@ -33,42 +54,66 @@ xdg-user-dirs
     xdg-user-dirs-gtk
     libappindicator
     AppStream
-libvdpau-va-gl 
+
-vdpauinfo
+
-pipewire
+# LOOK AND FEEL
-gstreamer1-pipewire
+    adwaita-icon-theme
-upower
+    Adapta
-flatpak
+    gnome-themes-standard
-zenity
+
-bash-completion
+# FILE SYSTEM
-pm-utils
+    ntfs-3g
-nano
+    exfat-utils
-xdg-utils
+    fuse-exfat
-vim
-git
-alsa-utils
-paprefs
-pasystray
-pavucontrol
-xterm
-htop
-tuxc
-topgrade
-ntp
-void-repo-multilib
-void-repo-nonfree
-octoxbps
-gksu
     gvfs-afc 
     gvfs-mtp 
     gvfs-smb 
     udisks2
-ntfs-3g
+    gparted
+
+# PACKAGE MANAGEMENT
+    flatpak
+    tuxc
+    octoxbps
+    topgrade
+
+# AUTH
+    elogind
+    dbus-elogind
+    gksu
     gnome-keyring
-network-manager-applet
+
+# DEVELOPMENT
+    git
+    
+# REPOSITORIES
+    void-repo-multilib
+    void-repo-nonfree
+
+#USERLAND PACKAGES
+
+    
+    
+    
+    
+    
+    
+    
+    
+     
+    
+    
+    upower
+    
+    zenity
+    bash-completion
+    nano
+    
+    vim
+    xterm
+    htop
+    dtrx
+    p7zip
     firefox
-xfce4 
+    
-xfce4-plugins
+    
-Adapta
-papirus-icon-theme
-gnome-themes-standard

xfce-x64.sh

@@ -3,32 +3,45 @@ DESKTOP="xfce"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
 FILENAME="void-live-${DESKTOP}-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
 BUILDDIR="$(pwd)/build"
 
-#shift $((OPTIND - 1))
+retry=0
 
-#: ${ARCH:=$(uname -m)}
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
+    ((retry++))
+    if [[ $retry -gt 2 ]];then
+        break
+    fi
 
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \
         -T "Void Linux ${DESKTOP} Unofficial" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
+done
 
 if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then
+    retries=${1}
+    until [[ $retries -gt 2 ]];do
+        echo "Retrying build ${retries}" 
+        ((retries++))
+        bash ${0} ${retries}
+
+    done
+    if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then    
         echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!"
         echo "ERR=1" > error-status.txt
         exit 1
     fi
+fi
 
 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt