Chroot tuning and fixing for arch

Author: solcloud

distro_extractor/README.md

@@ -4,8 +4,8 @@ NiceOS do not provide package manager. Instead, it uses other distributions pack
 
 Currently, we support **3** extract methods:
 - Virtual machine (**vm**)
-  - our recommended method for extracting
-  - you need virtual machine provider (_QEMU_ or _VirtualBox_) and distribution install _ISO_
+  - **our recommended method for extracting**
+  - you need virtual machine provider (_QEMU_ or _VirtualBox_) and distribution installation _ISO_
 - Root file system (**rfs**)
   - installing by extracting distribution _rootfs_ into temp folder and perform _chroot_ install there 
 - Debootstrap (**deb**)
@@ -18,7 +18,7 @@ NiceOS support out of the box these distributions (alphabetical order):
 ---
 **NOTE:**
 Always check firstly for latest version for your architecture and desired flavour on distribution homepage or use your specific version instead of example one.
-Also, many distributions provide mirrors at different geographical places and URLs - try to use closest and fastest mirror for you.
+Also, many distributions provide mirrors at different geographical places and URLs - try to use closest and fastest mirror for you. And always check downloaded files signature.
 ---
 
 

distro_extractor/arch-based/inc.sh

@@ -4,5 +4,12 @@ PM=arch
 
 function distro_install_command() {
     packages=$(cat "$NICE_PRESET_PATH/packages.${PM}.txt" | xargs)
-    echo "pacman -Sy --noconfirm $packages"
+
+    # Disable pacman checking free space
+    echo -n 'cat /etc/pacman.conf | sed "s/CheckSpace/#CheckSpace/" > /tmp/pacman.conf && '
+    echo -n 'cp /tmp/pacman.conf /etc/pacman.conf && '
+
+    # Add default server and initialize keys
+    echo -n 'echo "Server = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch" >> "/etc/pacman.d/mirrorlist" && '
+    echo -n "pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm $packages"
 }

scripts/extract_from_chroot.sh

@@ -6,14 +6,26 @@ source ./.config.sh || exit 1
 source "$BASE/distro_extractor/$DISTRO/inc.sh" || dd "File '$BASE/distro_extractor/$DISTRO/inc.sh' cannot be sourced"
 command=$(distro_install_command)
 
+if [ "0" == $(ls "$VM_MOUNT_ROOT" | wc -l) ]; then
+    dd "Chroot path $VM_MOUNT_ROOT seems empty, probably tar failed"
+elif [ "1" == $(ls "$VM_MOUNT_ROOT" | wc -l) ]; then
+    # Rootfs has been pack in one folder
+    export VM_MOUNT_ROOT="$VM_MOUNT_ROOT/$(ls "$VM_MOUNT_ROOT")"
+fi
+
 notify "We need sudo for bind mounting, chroot and cleanup"
+sudo cp /etc/resolv.conf "$VM_MOUNT_ROOT/etc/"
+
 sudo mount --bind /sys "$VM_MOUNT_ROOT/sys"
-sudo mount --bind /dev "$VM_MOUNT_ROOT/dev"
 sudo mount --bind /proc "$VM_MOUNT_ROOT/proc"
-sudo cp /etc/resolv.conf "$VM_MOUNT_ROOT/etc/"
+sudo mount --bind /dev "$VM_MOUNT_ROOT/dev"
 
+[[ $(type -t chroot_pre_hook) == 'function' ]] && chroot_pre_hook || true
 sudo chroot "$VM_MOUNT_ROOT" /bin/sh -c "'$command'"
 
-sudo umount "$VM_MOUNT_ROOT/proc"
-sudo umount "$VM_MOUNT_ROOT/dev"
-sudo umount "$VM_MOUNT_ROOT/sys"
+sudo umount -l "$VM_MOUNT_ROOT/dev"
+sudo umount -l "$VM_MOUNT_ROOT/proc"
+sudo umount -l "$VM_MOUNT_ROOT/sys"
+
+./scripts/extract.sh
+sudo rm -rf "$VM_MOUNT_ROOT"

scripts/extract_signpost.sh

@@ -25,18 +25,17 @@ elif [ -n "$DISTRO_ROOTFS" ]; then
     requires_distro_variable
     export NICE_EXTRACT_DISTRO_HDD_IMAGE_PATH=/tmp/nice-not-exists.noimg
     export VM_MOUNT_ROOT="$STORAGE/temp/extract/rootfs_$(date +%s)" && mkdir -p "$VM_MOUNT_ROOT"
-    tar --checkpoint=100 -xf "$DISTRO_ROOTFS" -C "$VM_MOUNT_ROOT"
+    notify "We need sudo for untar rootfs"
+    sudo tar --checkpoint=100 -xf "$DISTRO_ROOTFS" -C "$VM_MOUNT_ROOT"
     ./scripts/extract_from_chroot.sh
-    ./scripts/extract.sh
-    sudo rm -rf "$VM_MOUNT_ROOT"
 
 elif [ -n "$DEBOOTSTRAP_SUITE" ]; then
     which debootstrap > /dev/null || dd "Debootstrap binary not found"
 
     export VM_MOUNT_ROOT="$STORAGE/temp/extract/debootstrap_$(date +%s)" && mkdir -p "$VM_MOUNT_ROOT"
     export NICE_EXTRACT_DISTRO_HDD_IMAGE_PATH=/tmp/nice-not-exists.noimg
     notify "We need sudo for debootstrap and cleanup"
-    sudo debootstrap --variant=minbase --merged-usr --arch="${ARCH:-amd64}" --include="$(cat "$NICE_PRESET_PATH/packages.deb.txt" | xargs | sed 's/ /,/g')" "$DEBOOTSTRAP_SUITE" "$VM_MOUNT_ROOT" "$DEBOOTSTRAP_MIRROR" "$DEBOOTSTRAP_SCRIPT"
+    sudo debootstrap --variant=minbase --merged-usr --arch="${NICE_ARCH:-amd64}" --include="$(cat "$NICE_PRESET_PATH/packages.deb.txt" | xargs | sed 's/ /,/g')" "$DEBOOTSTRAP_SUITE" "$VM_MOUNT_ROOT" "$DEBOOTSTRAP_MIRROR" "$DEBOOTSTRAP_SCRIPT"
     ./scripts/extract.sh
     sudo rm -rf "$VM_MOUNT_ROOT"