From 3dcfb367c62ca823ce40bdc33741b3dc9fa84891 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 16 Feb 2019 20:43:08 -0800 Subject: [PATCH 01/10] installer.sh.in: use .org website, use https --- installer.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installer.sh.in b/installer.sh.in index 1fa366f..f9b311a 100644 --- a/installer.sh.in +++ b/installer.sh.in @@ -94,7 +94,7 @@ WIDGET_SIZE="10 70" DIALOG() { rm -f $ANSWER dialog --colors --keep-tite --no-shadow --no-mouse \ - --backtitle "${BOLD}${WHITE}Void Linux installation -- https://www.voidlinux.eu/ (@@MKLIVE_VERSION@@)${RESET}" \ + --backtitle "${BOLD}${WHITE}Void Linux installation -- https://www.voidlinux.org (@@MKLIVE_VERSION@@)${RESET}" \ --cancel-label "Back" --aspect 20 "$@" 2>$ANSWER return $? } @@ -102,7 +102,7 @@ DIALOG() { INFOBOX() { # Note: dialog --infobox and --keep-tite don't work together dialog --colors --no-shadow --no-mouse \ - --backtitle "${BOLD}${WHITE}Void Linux installation -- https://www.voidlinux.eu/ (@@MKLIVE_VERSION@@)${RESET}" \ + --backtitle "${BOLD}${WHITE}Void Linux installation -- https://www.voidlinux.org (@@MKLIVE_VERSION@@)${RESET}" \ --title "${TITLE}" --aspect 20 --infobox "$@" } @@ -1444,7 +1444,7 @@ Linux distribution made from scratch and built from the source package tree \ available for XBPS, a new alternative binary package system.\n\n The installation should be pretty straightforward. If you are in trouble \ please join us at ${BOLD}#voidlinux${RESET} on ${BOLD}irc.freenode.org${RESET}.\n\n -${BOLD}http://www.voidlinux.eu${RESET}\n\n" 16 80 +${BOLD}https://www.voidlinux.org${RESET}\n\n" 16 80 while true; do menu From f1a9d5f3ee8f26aee73a7432c6ff91169a0f711d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 16 Feb 2019 20:43:26 -0800 Subject: [PATCH 02/10] data/issue: use .org website, use https --- data/issue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/issue b/data/issue index 1681e40..70a1a62 100644 --- a/data/issue +++ b/data/issue @@ -20,6 +20,6 @@ sure to configure your network interface and then use: Thanks for using Void Linux. - http://www.voidlinux.eu + https://www.voidlinux.org ############################################################################### From d2c6fdf1a72e86d9d8cb5b85d7ddc804074aca83 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 16 Feb 2019 20:43:59 -0800 Subject: [PATCH 03/10] dracut: use .org website, use https --- dracut/netmenu/netmenu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut/netmenu/netmenu.sh b/dracut/netmenu/netmenu.sh index 3d42579..a873b1c 100755 --- a/dracut/netmenu/netmenu.sh +++ b/dracut/netmenu/netmenu.sh @@ -1,7 +1,7 @@ #!/bin/sh dialog --colors --keep-tite --no-shadow --no-mouse \ - --backtitle "\Zb\Z7Void Linux installation -- http://www.voidlinux.eu/\Zn" \ + --backtitle "\Zb\Z7Void Linux installation -- https://www.voidlinux.org\Zn" \ --cancel-label "Reboot" --aspect 20 \ --menu "Select an Action:" 10 50 2 \ "Install" "Run void-installer" \ From 08173eb25fa2a5e63ff5e254e3c219692c69f48a Mon Sep 17 00:00:00 2001 From: mobinmob <39646700+mobinmob@users.noreply.github.com> Date: Mon, 18 Feb 2019 22:38:44 +0200 Subject: [PATCH 04/10] mklive.sh: remove unused ISO_VOLUME variable. --- mklive.sh.in | 1 - 1 file changed, 1 deletion(-) diff --git a/mklive.sh.in b/mklive.sh.in index 1a160b7..5549dd6 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -346,7 +346,6 @@ fi readonly CURDIR="$PWD" -ISO_VOLUME="VOID_LIVE" if [ -n "$ROOTDIR" ]; then BUILDDIR=$(mktemp --tmpdir="$ROOTDIR" -d) else From f5ee7f420e6ab0e1eee17e7ac2e59eb8c00545b4 Mon Sep 17 00:00:00 2001 From: mobinmob <39646700+mobinmob@users.noreply.github.com> Date: Fri, 17 Aug 2018 03:15:01 +0300 Subject: [PATCH 05/10] mklive.sh: Use overlayfs for live image writable overlay. --- mklive.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mklive.sh.in b/mklive.sh.in index 5549dd6..8f2ec16 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -319,8 +319,9 @@ while getopts "a:b:r:c:C:T:Kk:l:i:I:s:S:o:p:h" opt; do esac done shift $((OPTIND - 1)) - XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=http://alpha.de.repo.voidlinux.org/current --repository=http://alpha.de.repo.voidlinux.org/current/musl" +# Configure dracut to use overlayfs for the writable overlay. +BOOT_CMDLINE="$BOOT_CMDLINE rd.live.overlay.overlayfs=1 " ARCH=$(xbps-uhelper arch) From 77442599ced04717673e129c98ce07a015fd6bdd Mon Sep 17 00:00:00 2001 From: mobinmob <39646700+mobinmob@users.noreply.github.com> Date: Fri, 17 Aug 2018 03:16:59 +0300 Subject: [PATCH 06/10] mklive.sh: Remove $ROOTFS_FREESIZE --- mklive.sh.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mklive.sh.in b/mklive.sh.in index 8f2ec16..00b8d4c 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -75,7 +75,6 @@ directory if unset). -l Default locale to use (en_US.UTF-8 if unset). -i Compression type for the initramfs image (xz if unset). -s Compression type for the squashfs image (xz if unset) - -S Allocate this free size (MB) for the rootfs. -o Output file name for the ISO image (auto if unset). -p "pkg pkgN ..." Install additional packages into the ISO image. -I Include directory structure under given path into rootfs @@ -259,11 +258,8 @@ generate_squashfs() { # Find out required size for the rootfs and create an ext3fs image off it. ROOTFS_SIZE=$(du -sm "$ROOTFS"|awk '{print $1}') - if [ -z "$ROOTFS_FREESIZE" ]; then - ROOTFS_FREESIZE="$((ROOTFS_SIZE/6))" - fi mkdir -p "$BUILDDIR/tmp/LiveOS" - truncate -s "$((ROOTFS_SIZE+ROOTFS_FREESIZE))M" \ + truncate -s "$((ROOTFS_SIZE+ROOTFS_SIZE/6)M" \ "$BUILDDIR"/tmp/LiveOS/ext3fs.img >/dev/null 2>&1 mkdir -p "$BUILDDIR/tmp-rootfs" mkfs.ext3 -F -m1 "$BUILDDIR/tmp/LiveOS/ext3fs.img" >/dev/null 2>&1 From 8d364654ed7e1a6d5e5205125aa590d2d7765693 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 17 Aug 2018 04:01:48 +0300 Subject: [PATCH 07/10] Missing parenthesis. Closes: #14 [via git-merge-pr] --- mklive.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mklive.sh.in b/mklive.sh.in index 00b8d4c..c568e45 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -259,7 +259,7 @@ generate_squashfs() { # Find out required size for the rootfs and create an ext3fs image off it. ROOTFS_SIZE=$(du -sm "$ROOTFS"|awk '{print $1}') mkdir -p "$BUILDDIR/tmp/LiveOS" - truncate -s "$((ROOTFS_SIZE+ROOTFS_SIZE/6)M" \ + truncate -s "$((ROOTFS_SIZE+ROOTFS_SIZE/6))M" \ "$BUILDDIR"/tmp/LiveOS/ext3fs.img >/dev/null 2>&1 mkdir -p "$BUILDDIR/tmp-rootfs" mkfs.ext3 -F -m1 "$BUILDDIR/tmp/LiveOS/ext3fs.img" >/dev/null 2>&1 From b2c13855705cead5614428b2f47333f59cc3cdda Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 8 Mar 2019 10:02:08 +0100 Subject: [PATCH 08/10] add Dockerfile This commit adds a Dockerfile that can be build using podman or docker. --- Dockerfile | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..17e2914 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,33 @@ +# 1) use alpine to generate a void environment +FROM alpine:3.9 as stage0 +ARG REPOSITORY=https://alpha.de.repo.voidlinux.org/current +ARG ARCH=x86_64 +COPY keys/* /target/var/db/xbps/keys/ +RUN apk add ca-certificates && \ + wget -O - https://alpha.de.repo.voidlinux.org/static/xbps-static-latest.$(uname -m)-musl.tar.xz | \ + tar Jx && \ + XBPS_ARCH=${ARCH} xbps-install.static -yMU \ + --repository=${REPOSITORY} \ + --repository=${REPOSITORY}/musl \ + -r /target \ + base-minimal + +# 2) using void to generate the final build +FROM scratch as stage1 +ARG REPOSITORY=https://alpha.de.repo.voidlinux.org/current +ARG ARCH=x86_64 +COPY --from=stage0 /target / +COPY keys/* /target/var/db/xbps/keys/ +RUN xbps-reconfigure -a && \ + mkdir -p /target/var/cache && ln -s /var/cache/xbps /target/var/cache/xbps && \ + XBPS_ARCH=${ARCH} xbps-install -yMU \ + --repository=${REPOSITORY} \ + --repository=${REPOSITORY}/musl \ + -r /target \ + base-minimal + +# 3) configure and clean up the final image +FROM scratch +COPY --from=stage1 /target / +RUN xbps-reconfigure -a && \ + rm -r /var/cache/xbps From 92bb9df1d3054771f96267c149e70850f7175429 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 14 Mar 2019 23:30:10 +0100 Subject: [PATCH 09/10] add hooks for dockerhub --- hooks/README.md | 1 + hooks/build | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 hooks/README.md create mode 100755 hooks/build diff --git a/hooks/README.md b/hooks/README.md new file mode 100644 index 0000000..fb08370 --- /dev/null +++ b/hooks/README.md @@ -0,0 +1 @@ +hooks for Docker diff --git a/hooks/build b/hooks/build new file mode 100755 index 0000000..7c11361 --- /dev/null +++ b/hooks/build @@ -0,0 +1,2 @@ +#!/bin/sh +docker build --build-arg ARCH=$ARCH -t $IMAGE_NAME . From 1b0964cc8297425a1b59335bd32c86d7b557e800 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 8 Mar 2019 09:42:26 +0100 Subject: [PATCH 10/10] lib.sh.in: fix tool checking. --- lib.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib.sh.in b/lib.sh.in index 4799453..c5cc433 100644 --- a/lib.sh.in +++ b/lib.sh.in @@ -31,7 +31,7 @@ check_tools() { # if a different version of something is used than was expected. for tool in $LIBTOOLS $REQTOOLS ; do if ! which "$tool" > /dev/null ; then - die "Required tool $f is not available on this system!" + die "Required tool $tool is not available on this system!" fi done