@ -36,6 +36,7 @@ function common_variables() {
fi fi
if [ $DISTRIBUTION_ARCH = "amd64" ]; then if [ $DISTRIBUTION_ARCH = "amd64" ]; then
echo "+++++++++===amd64===+++++++++"
KERNEL_ARCH="amd64" KERNEL_ARCH="amd64"
#PACKAGE_VARIANT="standard" #PACKAGE_VARIANT="standard"
elif [ $DISTRIBUTION_ARCH = "i386" ]; then elif [ $DISTRIBUTION_ARCH = "i386" ]; then
@ -269,7 +270,7 @@ function check_is_in_chroot() {
function check_mounted() {function check_mounted() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if grep -qs "$BUILD_DIR/dev" /proc/mounts || grep -qs "$BUILD_DIR/run" /proc/mounts || grep -qs "$BUILD_DIR/proc" /proc/mounts || grep -qs "$BUILD_DIR/sys" /proc/mounts || grep -qs "$BUILD_DIR/dev/pts" /proc/mounts || grep -qs "$BUILD _DIR/tmp" /proc/mounts; then if grep -qs "$INSTALL_DIR/dev" /proc/mounts || grep -qs "$INSTALL_DIR/run" /proc/mounts || grep -qs "$INSTALL_DIR/proc" /proc/mounts || grep -qs "$INSTALL_DIR/sys" /proc/mounts || grep -qs "$INSTALL_DIR/dev/pts" /proc/mounts || grep -qs "$INSTALL _DIR/tmp" /proc/mounts; then
echo -e "${BOLD}${LIGHTYELLOW}Сhroot contains mounted filesystems.${ENDCOLOUR}" echo -e "${BOLD}${LIGHTYELLOW}Сhroot contains mounted filesystems.${ENDCOLOUR}"
if [ "$UNATTENDED" = "1" ]; then if [ "$UNATTENDED" = "1" ]; then
chroot_umount_fs chroot_umount_fs
@ -290,40 +291,40 @@ function check_mounted() {
# проверяем, пуста ли папка, в которую будет производиться установка# проверяем, пуста ли папка, в которую будет производиться установка
# =================================================================# =================================================================
function check_build _dir() {function check_install _dir() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ "$UNATTENDED" = "1" ]; then if [ "$UNATTENDED" = "1" ]; then
#echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}" #echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}"
BUILD_DIR="/build/$DISTRIBUTION " INSTALL_DIR="$BUILD_DIR/$DISTRIBUTION-$DISTRIBUTION_ARCH "
echo -e "The working directory is ${MAGENTA}$BUILD _DIR${ENDCOLOUR}." echo -e "The working directory is ${MAGENTA}$INSTALL _DIR${ENDCOLOUR}."
if [ "$(ls -A $BUILD _DIR)" != "" ]; then if [ "$(ls -A $INSTALL _DIR)" != "" ]; then
cleanup cleanup
check_mounted check_mounted
fi fi
else else
# ▼ должно быть только перенаправление ошибки! # ▼ должно быть только перенаправление ошибки!
if [ "$(ls -A $BUILD _DIR)" != "" ]; then if [ "$(ls -A $INSTALL _DIR)" != "" ]; then
echo -e "${MAGENTA}$BUILD _DIR${ENDCOLOUR} is not empty." echo -e "${MAGENTA}$INSTALL _DIR${ENDCOLOUR} is not empty."
cleanup cleanup
check_mounted check_mounted
if [ ! -d "$BUILD _DIR" ]; then if [ ! -d "$INSTALL _DIR" ]; then
mkdir -p $BUILD _DIR mkdir -p $INSTALL _DIR
fi fi
BUILD _DIR="$( INSTALL _DIR="$(
cd $BUILD _DIR cd $INSTALL _DIR
pwd pwd
)" )"
echo $BUILD_DIR >$SCRIPT_DIR/.build_dir && chmod 644 $SCRIPT_DIR/.build _dir echo $INSTALL_DIR >$SCRIPT_DIR/.install_dir && chmod 644 $SCRIPT_DIR/.install _dir
echo -e "The working directory is ${MAGENTA}$BUILD _DIR${ENDCOLOUR}." echo -e "The working directory is ${MAGENTA}$INSTALL _DIR${ENDCOLOUR}."
else else
mkdir -p $BUILD _DIR mkdir -p $INSTALL _DIR
check_mounted check_mounted
BUILD _DIR="$( INSTALL _DIR="$(
cd $BUILD _DIR cd $INSTALL _DIR
pwd pwd
)" )"
echo $BUILD_DIR >$SCRIPT_DIR/.build_dir && chmod 644 $SCRIPT_DIR/.build _dir echo $INSTALL_DIR >$SCRIPT_DIR/.install_dir && chmod 644 $SCRIPT_DIR/.install _dir
echo -e "The working directory is ${MAGENTA}$BUILD _DIR${ENDCOLOUR}." echo -e "The working directory is ${MAGENTA}$INSTALL _DIR${ENDCOLOUR}."
fi fi
fi fi
}}
@ -333,37 +334,37 @@ function check_build_dir() {
# настраиваем папку для сборки# настраиваем папку для сборки
# =================================================================# =================================================================
function setup_build _dir() {function setup_install _dir() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ "$UNATTENDED" = "1" ] && [ "$BUILD _DIR" = "" ]; then if [ "$UNATTENDED" = "1" ] && [ "$INSTALL _DIR" = "" ]; then
BUILD_DIR="/build /$DISTRIBUTION" INSTALL_DIR="$BUILD_DIR /$DISTRIBUTION"
check_build _dir check_install _dir
else else
if [ "$BUILD _DIR" = "" ]; then if [ "$INSTALL _DIR" = "" ]; then
if [ ! -f "$SCRIPT_DIR/.build _dir" ]; then if [ ! -f "$SCRIPT_DIR/.install _dir" ]; then
echo "Enter the address of the working directory where we will build the system" echo "Enter the address of the working directory where we will build the system"
read -r -p "$(echo -e "(Default is ${MAGENTA}$PARENT _DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response read -r -p "$(echo -e "(Default is ${MAGENTA}$BUILD _DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response
BUILD _DIR=${response,,} INSTALL _DIR=${response,,}
if [ "$BUILD _DIR" = "" ]; then if [ "$INSTALL _DIR" = "" ]; then
BUILD_DIR=$PARENT _DIR/$DISTRIBUTION INSTALL_DIR=$BUILD _DIR/$DISTRIBUTION
fi fi
check_build _dir check_install _dir
else else
LAST_BUILD_DIR=$(cat "$SCRIPT_DIR/.build _dir") LAST_INSTALL_DIR=$(cat "$SCRIPT_DIR/.install _dir")
echo -e "Last time you used the build directory ${MAGENTA}$LAST_BUILD _DIR${ENDCOLOUR}." echo -e "Last time you used the build directory ${MAGENTA}$LAST_INSTALL _DIR${ENDCOLOUR}."
read -r -p "$(echo -e ""Do you want to use it again? [${BOLD}${GREEN}Y${ENDCOLOUR}/n])" response read -r -p "$(echo -e ""Do you want to use it again? [${BOLD}${GREEN}Y${ENDCOLOUR}/n])" response
response=${response,,} response=${response,,}
if [[ "$response" =~ ^(no|n)$ ]]; then if [[ "$response" =~ ^(no|n)$ ]]; then
echo "Enter the address of the working directory where we will build the system" echo "Enter the address of the working directory where we will build the system"
read -r -p "$(echo -e "(Default is ${MAGENTA}$PARENT _DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response read -r -p "$(echo -e "(Default is ${MAGENTA}$BUILD _DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response
BUILD _DIR=${response,,} INSTALL _DIR=${response,,}
if [ "$BUILD _DIR" = "" ]; then if [ "$INSTALL _DIR" = "" ]; then
BUILD_DIR=$PARENT _DIR/$DISTRIBUTION INSTALL_DIR=$BUILD _DIR/$DISTRIBUTION
fi fi
check_build _dir check_install _dir
else else
BUILD_DIR="$LAST_BUILD _DIR" INSTALL_DIR="$LAST_INSTALL _DIR"
check_build _dir check_install _dir
fi fi
fi fi
fi fi
@ -379,21 +380,21 @@ function cleanup() {
if [ "${CMD[ii]}" = "setup_host" ] || [ "${CMD[ii]}" = "build_bootstrap" ] || [ "${CMD[ii]}" = "build_chroot" ]; then if [ "${CMD[ii]}" = "setup_host" ] || [ "${CMD[ii]}" = "build_bootstrap" ] || [ "${CMD[ii]}" = "build_chroot" ]; then
if [ "$UNATTENDED" = "1" ]; then if [ "$UNATTENDED" = "1" ]; then
check_mounted check_mounted
rm -rf $BUILD _DIR rm -rf $INSTALL _DIR
if [ -d "$BUILD _DIR" ]; then if [ -d "$INSTALL _DIR" ]; then
cleanup cleanup
fi fi
else else
read -r -p "$(echo -e ""Do you want to ${BOLD}${RED}completely remove content${ENDCOLOUR} of ${MAGENTA}$BUILD _DIR${ENDCOLOUR}? [y/${BOLD}${GREEN}N${ENDCOLOUR}])" response read -r -p "$(echo -e ""Do you want to ${BOLD}${RED}completely remove content${ENDCOLOUR} of ${MAGENTA}$INSTALL _DIR${ENDCOLOUR}? [y/${BOLD}${GREEN}N${ENDCOLOUR}])" response
response=${response,,} response=${response,,}
if [[ "$response" =~ ^(yes|y)$ ]]; then if [[ "$response" =~ ^(yes|y)$ ]]; then
check_mounted check_mounted
rm -rf $BUILD _DIR rm -rf $INSTALL _DIR
if [ -d "$BUILD _DIR" ]; then if [ -d "$INSTALL _DIR" ]; then
cleanup cleanup
fi fi
else else
echo -e "${MAGENTA}$BUILD _DIR${ENDCOLOUR} should be empty to continue." echo -e "${MAGENTA}$INSTALL _DIR${ENDCOLOUR} should be empty to continue."
exit 1 exit 1
fi fi
fi fi
@ -411,22 +412,22 @@ function chroot_mount_fs() {
check_mounted check_mounted
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
if [ -L $BUILD_DIR/etc/resolv.conf ]; then if [ -L $INSTALL_DIR/etc/resolv.conf ] || [ $DISTRIBUTION = "stretch" ]; then
mv $BUILD_DIR/etc/resolv.conf $BUILD _DIR/etc/resolv.conf.bak mv $INSTALL_DIR/etc/resolv.conf $INSTALL _DIR/etc/resolv.conf.bak
echo "nameserver 8.8.8.8" >$BU ILD _DIR/etc/resolv.conf echo "nameserver 8.8.8.8" >> $INSTAL L_DIR/etc/resolv.conf
fi fi
fi fi
mount --bind /dev $BUILD _DIR/dev mount --bind /dev $INSTALL _DIR/dev
mount --bind /run $BUILD _DIR/run mount --bind /run $INSTALL _DIR/run
if [ $DISTRIBUTION = "stretch" ]; then if [ $DISTRIBUTION = "stretch" ]; then
mount --bind /proc $BUILD _DIR/proc mount --bind /proc $INSTALL _DIR/proc
else else
mount none -t proc $BUILD _DIR/proc mount none -t proc $INSTALL _DIR/proc
fi fi
mount none -t sysfs $BUILD _DIR/sys mount none -t sysfs $INSTALL _DIR/sys
mount none -t devpts $BUILD _DIR/dev/pts mount none -t devpts $INSTALL _DIR/dev/pts
mount none -t tmpfs $BUILD _DIR/tmp mount none -t tmpfs $INSTALL _DIR/tmp
}}
# =================================================================# =================================================================
@ -439,26 +440,26 @@ function chroot_umount_fs() {
set +e set +e
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
umount $BUILD _DIR/proc umount $INSTALL _DIR/proc
umount $BUILD _DIR/sys umount $INSTALL _DIR/sys
umount $BUILD _DIR/dev/pts umount $INSTALL _DIR/dev/pts
umount $BUILD _DIR/tmp umount $INSTALL _DIR/tmp
umount $BUILD _DIR/dev umount $INSTALL _DIR/dev
umount $BUILD _DIR/run umount $INSTALL _DIR/run
else else
umount $BUILD _DIR/proc >>$OUTPUT 2>&1 umount $INSTALL _DIR/proc >>$OUTPUT 2>&1
umount $BUILD _DIR/sys >>$OUTPUT 2>&1 umount $INSTALL _DIR/sys >>$OUTPUT 2>&1
umount $BUILD _DIR/dev/pts >>$OUTPUT 2>&1 umount $INSTALL _DIR/dev/pts >>$OUTPUT 2>&1
umount $BUILD _DIR/tmp >>$OUTPUT 2>&1 umount $INSTALL _DIR/tmp >>$OUTPUT 2>&1
umount $BUILD _DIR/dev >>$OUTPUT 2>&1 umount $INSTALL _DIR/dev >>$OUTPUT 2>&1
umount $BUILD _DIR/run >>$OUTPUT 2>&1 umount $INSTALL _DIR/run >>$OUTPUT 2>&1
fi fi
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
if [ -L $BUILD_DIR/etc/resolv.conf.bak ] && [ ! -L $BUILD_DIR/etc/resolv.conf ]; then if [ -L $INSTALL_DIR/etc/resolv.conf.bak ] || [ $DISTRIBUTION = "stretch" ]; then
rm -f $BUILD _DIR/etc/resolv.conf rm -f $INSTALL _DIR/etc/resolv.conf
mv $BUILD_DIR/etc/resolv.conf.bak $BUILD _DIR/etc/resolv.conf mv $INSTALL_DIR/etc/resolv.conf.bak $INSTALL _DIR/etc/resolv.conf
elif [ -L $BUILD_DIR/etc/resolv.conf.bak ] && [ -L $BUILD _DIR/etc/resolv.conf ]; then elif [ -L $INSTALL_DIR/etc/resolv.conf.bak ] && [ -L $INSTALL _DIR/etc/resolv.conf ]; then
rm -f $BUILD _DIR/etc/resolv.conf.bak rm -f $INSTALL _DIR/etc/resolv.conf.bak
fi fi
fi fi
set -e set -e
@ -475,8 +476,8 @@ function remove_log_file() {
if [ -f $LOGPATH/$LIVEKITNAME.log ]; then if [ -f $LOGPATH/$LIVEKITNAME.log ]; then
rm -f $LOGPATH/$LIVEKITNAME.log rm -f $LOGPATH/$LIVEKITNAME.log
fi fi
if [ -f $BUILD _DIR/$LIVEKITNAME.log ]; then if [ -f $INSTALL _DIR/$LIVEKITNAME.log ]; then
rm -f $BUILD _DIR/$LIVEKITNAME.log rm -f $INSTALL _DIR/$LIVEKITNAME.log
fi fi
}}
@ -496,30 +497,30 @@ function create_backup() {
DATE=$(date +%Y%m%d_%H%M) DATE=$(date +%Y%m%d_%H%M)
CHANGED="0" CHANGED="0"
rm -rf $SCRIPT_DIR/iso >>$OUTPUT 2>&1 rm -rf $SCRIPT_DIR/iso >>$OUTPUT 2>&1
rm -f $SCRIPT_DIR/.build _dir >>$OUTPUT 2>&1 rm -f $SCRIPT_DIR/.install _dir >>$OUTPUT 2>&1
rm -f $SCRIPT_DIR/*.log >>$OUTPUT 2>&1 rm -f $SCRIPT_DIR/*.log >>$OUTPUT 2>&1
if [ ! -d $PARENT _DIR/minios-live-current ]; then if [ ! -d $BUILD _DIR/minios-live-current ]; then
CHANGED="1" CHANGED="1"
mkdir -p $PARENT _DIR/minios-live-current mkdir -p $BUILD _DIR/minios-live-current
(cd $SCRIPT_DIR && cp --parents -afr * $PARENT _DIR/minios-live-current) (cd $SCRIPT_DIR && cp --parents -afr * $BUILD _DIR/minios-live-current)
else else
for file in $(find $SCRIPT_DIR -path $SCRIPT_DIR/.git -prune -false -o -type f | sed "s,$SCRIPT_DIR/,,g" | sed "s,.script_version,,g"); do for file in $(find $SCRIPT_DIR -path $SCRIPT_DIR/.git -prune -false -o -type f | sed "s,$SCRIPT_DIR/,,g" | sed "s,.script_version,,g"); do
if ! cmp $SCRIPT_DIR/$file $PARENT _DIR/minios-live-current/$file >>$OUTPUT 2>&1; then if ! cmp $SCRIPT_DIR/$file $BUILD _DIR/minios-live-current/$file >>$OUTPUT 2>&1; then
CHANGED="1" CHANGED="1"
echo -e "$file has been modified since last backup." >>$OUTPUT 2>&1 echo -e "$file has been modified since last backup." >>$OUTPUT 2>&1
echo -e "Copying $SCRIPT_DIR/$file to $PARENT _DIR/minios-live-current/$file..." >>$OUTPUT 2>&1 echo -e "Copying $SCRIPT_DIR/$file to $BUILD _DIR/minios-live-current/$file..." >>$OUTPUT 2>&1
cp -f "$SCRIPT_DIR/$file" "$PARENT _DIR/minios-live-current/$file" >>$OUTPUT 2>&1 cp -f "$SCRIPT_DIR/$file" "$BUILD _DIR/minios-live-current/$file" >>$OUTPUT 2>&1
fi fi
done done
fi fi
if [ $CHANGED = "1" ]; then if [ $CHANGED = "1" ]; then
SCRIPT_VERSION=$(cat $SCRIPT_DIR/.script_version) SCRIPT_VERSION=$(cat $SCRIPT_DIR/.script_version)
echo $(($SCRIPT_VERSION + 1)) >$SCRIPT_DIR/.script_version echo $(($SCRIPT_VERSION + 1)) >$SCRIPT_DIR/.script_version
echo $(($SCRIPT_VERSION + 1)) >$PARENT _DIR/minios-live-current/.script_version echo $(($SCRIPT_VERSION + 1)) >$BUILD _DIR/minios-live-current/.script_version
cd $SCRIPT_DIR >>$OUTPUT 2>&1 cd $SCRIPT_DIR >>$OUTPUT 2>&1
rm -f $PARENT _DIR/minios-live-current.tar.gz rm -f $BUILD _DIR/minios-live-current.tar.gz
tar -czf $PARENT _DIR/minios-live-current.tar.gz ./ >>$OUTPUT 2>&1 tar -czf $BUILD _DIR/minios-live-current.tar.gz ./ >>$OUTPUT 2>&1
cp $PARENT_DIR/minios-live-current.tar.gz $PARENT _DIR/minios-live-v$SCRIPT_VERSION-$DATE.tar.gz >>$OUTPUT 2>&1 cp $BUILD_DIR/minios-live-current.tar.gz $BUILD _DIR/minios-live-v$SCRIPT_VERSION-$DATE.tar.gz >>$OUTPUT 2>&1
fi fi
fi fi
}}
@ -543,6 +544,9 @@ function new_run() {
echo "================= based container to install. ===================" >>$OUTPUT 2>&1 echo "================= based container to install. ===================" >>$OUTPUT 2>&1
echo "=================================================================" >>$OUTPUT 2>&1 echo "=================================================================" >>$OUTPUT 2>&1
echo "=================================================================" >>$OUTPUT 2>&1 echo "=================================================================" >>$OUTPUT 2>&1
echo "========== Distributution: $DISTRIBUTION" >>$OUTPUT 2>&1
echo "========== Arch: $DISTRIBUTION_ARCH" >>$OUTPUT 2>&1
echo "========== Compression: $COMP_TYPE" >>$OUTPUT 2>&1
echo "" echo ""
}}
@ -579,52 +583,52 @@ function build_bootstrap() {
fi fi
if [ $USE_ROOTFS = "1" ] && [ ! -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then if [ $USE_ROOTFS = "1" ] && [ ! -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
if [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then if [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then
if [ ! -d $BUILD _DIR ]; then if [ ! -d $INSTALL _DIR ]; then
mkdir -p $BUILD _DIR mkdir -p $INSTALL _DIR
fi fi
tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD _DIR tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $INSTALL _DIR
else else
# Раскомментировать для Ubuntu, но придётся вручную подбирать пакеты до соответсвия bootstrap Debian по пакетам. # Раскомментировать для Ubuntu, но придётся вручную подбирать пакеты до соответсвия bootstrap Debian по пакетам.
#if [ $DISTRIBUTION_TYPE != "debian" ]; then #if [ $DISTRIBUTION_TYPE != "debian" ]; then
# sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ # sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
# debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $BUILD _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT # debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $INSTALL _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
#else #else
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $BUILD _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $INSTALL _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
#fi #fi
if [ ! -d $SCRIPT_DIR/rootfs ]; then if [ ! -d $SCRIPT_DIR/rootfs ]; then
mkdir -p $SCRIPT_DIR/rootfs mkdir -p $SCRIPT_DIR/rootfs
fi fi
tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD _DIR . tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $INSTALL _DIR .
fi fi
elif [ $USE_ROOTFS = "1" ] && [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then elif [ $USE_ROOTFS = "1" ] && [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
if [ ! -d $BUILD _DIR ]; then if [ ! -d $INSTALL _DIR ]; then
mkdir -p $BUILD _DIR mkdir -p $INSTALL _DIR
fi fi
tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $BUILD _DIR tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $INSTALL _DIR
elif [ $USE_ROOTFS != "1" ] && [ $USE_BOOTSTRAP = "1" ]; then elif [ $USE_ROOTFS != "1" ] && [ $USE_BOOTSTRAP = "1" ]; then
if [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then if [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then
if [ ! -d $BUILD _DIR ]; then if [ ! -d $INSTALL _DIR ]; then
mkdir -p $BUILD _DIR mkdir -p $INSTALL _DIR
fi fi
tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD _DIR tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $INSTALL _DIR
else else
# Раскомментировать для Ubuntu, но придётся вручную подбирать пакеты до соответсвия bootstrap Debian по пакетам. # Раскомментировать для Ubuntu, но придётся вручную подбирать пакеты до соответсвия bootstrap Debian по пакетам.
#if [ $DISTRIBUTION_TYPE != "debian" ]; then #if [ $DISTRIBUTION_TYPE != "debian" ]; then
# sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ # sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
# debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $BUILD _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT # debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $INSTALL _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
#else #else
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $BUILD _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $INSTALL _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
#fi #fi
if [ ! -d $SCRIPT_DIR/rootfs ]; then if [ ! -d $SCRIPT_DIR/rootfs ]; then
mkdir -p $SCRIPT_DIR/rootfs mkdir -p $SCRIPT_DIR/rootfs
fi fi
tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD _DIR . tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $INSTALL _DIR .
fi fi
else else
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $BUILD _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $INSTALL _DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
fi fi
build_rootfs build_rootfs
@ -647,8 +651,8 @@ function build_rootfs() {
create_apt_list create_apt_list
cp -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list $BUILD _DIR/etc/apt/sources.list cp -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list $INSTALL _DIR/etc/apt/sources.list
cat <<'EOF' >$BUILD _DIR/etc/apt/apt.conf.d/000MiniOS cat <<'EOF' >$INSTALL _DIR/etc/apt/apt.conf.d/000MiniOS
APT::Install-Recommends "0";APT::Install-Recommends "0";
APT::Install-Suggests "0";APT::Install-Suggests "0";
Acquire::Languages { "none"; }Acquire::Languages { "none"; }
@ -656,7 +660,7 @@ EOF
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -673,7 +677,7 @@ EOF
USER_NAME=$USER_NAME \ USER_NAME=$USER_NAME \
$APT_CMD update $APT_OPTIONS $APT_CMD update $APT_OPTIONS
else else
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -691,12 +695,12 @@ EOF
$APT_CMD update $APT_OPTIONS >>$OUTPUT 2>&1 $APT_CMD update $APT_OPTIONS >>$OUTPUT 2>&1
fi fi
else else
chroot $BUILD _DIR $APT_CMD update $APT_OPTIONS >>$OUTPUT 2>&1 chroot $INSTALL _DIR $APT_CMD update $APT_OPTIONS >>$OUTPUT 2>&1
fi fi
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -713,7 +717,7 @@ EOF
USER_NAME=$USER_NAME \ USER_NAME=$USER_NAME \
$APT_CMD upgrade $APT_OPTIONS $APT_CMD upgrade $APT_OPTIONS
else else
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -731,13 +735,13 @@ EOF
$APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 $APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1
fi fi
else else
chroot $BUILD _DIR $APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 chroot $INSTALL _DIR $APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1
fi fi
if [ -f $SCRIPT_DIR/linux-live/pkglists/prereq.list ]; then if [ -f $SCRIPT_DIR/linux-live/pkglists/prereq.list ]; then
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -755,7 +759,7 @@ EOF
$APT_CMD install $APT_OPTIONS \ $APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/prereq.list | tr "\n" " ") $(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/prereq.list | tr "\n" " ")
else else
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -774,14 +778,14 @@ EOF
$(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1
fi fi
else else
chroot $BUILD _DIR $APT_CMD install $APT_OPTIONS \ chroot $INSTALL _DIR $APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1
fi fi
fi fi
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -798,7 +802,7 @@ EOF
USER_NAME=$USER_NAME \ USER_NAME=$USER_NAME \
$APT_CMD clean $APT_OPTIONS $APT_CMD clean $APT_OPTIONS
else else
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -816,11 +820,11 @@ EOF
$APT_CMD clean $APT_OPTIONS >>$OUTPUT 2>&1 $APT_CMD clean $APT_OPTIONS >>$OUTPUT 2>&1
fi fi
else else
chroot $BUILD _DIR $APT_CMD clean $APT_OPTIONS >>$OUTPUT 2>&1 chroot $INSTALL _DIR $APT_CMD clean $APT_OPTIONS >>$OUTPUT 2>&1
fi fi
chroot_umount_fs chroot_umount_fs
tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $BUILD _DIR . tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $INSTALL _DIR .
fi fi
fi fi
}}
@ -831,40 +835,40 @@ EOF
# =================================================================# =================================================================
function copy_build_scripts() {function copy_build_scripts() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ ! -d $BUILD _DIR/linux-live ]; then if [ ! -d $INSTALL _DIR/linux-live ]; then
mkdir -p $BUILD _DIR/linux-live mkdir -p $INSTALL _DIR/linux-live
(cd $SCRIPT_DIR/linux-live && cp --parents -afr * $BUILD _DIR/linux-live) (cd $SCRIPT_DIR/linux-live && cp --parents -afr * $INSTALL _DIR/linux-live)
else else
find $SCRIPT_DIR/linux-live -type f -print0 | sed "s,$SCRIPT_DIR/linux-live/,,g" | while IFS= read -r -d '' file; do find $SCRIPT_DIR/linux-live -type f -print0 | sed "s,$SCRIPT_DIR/linux-live/,,g" | while IFS= read -r -d '' file; do
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if ! cmp $SCRIPT_DIR/linux-live/"$file" $BUILD _DIR/linux-live/"$file"; then if ! cmp $SCRIPT_DIR/linux-live/"$file" $INSTALL _DIR/linux-live/"$file"; then
echo -e "$file has been modified since last build run." echo -e "$file has been modified since last build run."
echo -e "Copying $SCRIPT_DIR/linux-live/$file to $BUILD _DIR/linux-live/$file..." echo -e "Copying $SCRIPT_DIR/linux-live/$file to $INSTALL _DIR/linux-live/$file..."
cp -f $SCRIPT_DIR/linux-live/"$file" $BUILD _DIR/linux-live/"$file" cp -f $SCRIPT_DIR/linux-live/"$file" $INSTALL _DIR/linux-live/"$file"
fi fi
else else
if ! cmp $SCRIPT_DIR/linux-live/"$file" $BUILD _DIR/linux-live/"$file" >>$OUTPUT 2>&1; then if ! cmp $SCRIPT_DIR/linux-live/"$file" $INSTALL _DIR/linux-live/"$file" >>$OUTPUT 2>&1; then
echo -e "$file has been modified since last build run." >>$OUTPUT 2>&1 echo -e "$file has been modified since last build run." >>$OUTPUT 2>&1
echo -e "Copying $SCRIPT_DIR/linux-live/$file to $BUILD _DIR/linux-live/$file..." >>$OUTPUT 2>&1 echo -e "Copying $SCRIPT_DIR/linux-live/$file to $INSTALL _DIR/linux-live/$file..." >>$OUTPUT 2>&1
cp -f $SCRIPT_DIR/linux-live/"$file" $BUILD _DIR/linux-live/"$file" >>$OUTPUT 2>&1 cp -f $SCRIPT_DIR/linux-live/"$file" $INSTALL _DIR/linux-live/"$file" >>$OUTPUT 2>&1
fi fi
fi fi
done done
fi fi
#chmod +x $BUILD _DIR/linux-live/build #chmod +x $INSTALL _DIR/linux-live/build
chmod +x $BUILD _DIR/linux-live/install_chroot chmod +x $INSTALL _DIR/linux-live/install_chroot
if [ "$DEV_SYSTEM" = "1" ]; then if [ "$DEV_SYSTEM" = "1" ]; then
if [ ! -d $BUILD _DIR/opt/minios-live ]; then if [ ! -d $INSTALL _DIR/opt/minios-live ]; then
mkdir -p $BUILD _DIR/opt/minios-live mkdir -p $INSTALL _DIR/opt/minios-live
(cd $SCRIPT_DIR && cp --parents -afr * $BUILD _DIR/opt/minios-live) (cd $SCRIPT_DIR && cp --parents -afr * $INSTALL _DIR/opt/minios-live)
else else
find $SCRIPT_DIR/linux-live -type f -print0 | sed "s,$SCRIPT_DIR/linux-live/,,g" | while IFS= read -r -d '' file; do find $SCRIPT_DIR/linux-live -type f -print0 | sed "s,$SCRIPT_DIR/linux-live/,,g" | while IFS= read -r -d '' file; do
if ! cmp $SCRIPT_DIR/"$file" $BUILD _DIR/opt/minios-live/"$file" >>$OUTPUT 2>&1; then if ! cmp $SCRIPT_DIR/"$file" $INSTALL _DIR/opt/minios-live/"$file" >>$OUTPUT 2>&1; then
echo -e "$file has been modified since last build run." >>$OUTPUT 2>&1 echo -e "$file has been modified since last build run." >>$OUTPUT 2>&1
echo -e "Copying $SCRIPT_DIR/$file to $BUILD _DIR/opt/minios-live/$file..." >>$OUTPUT 2>&1 echo -e "Copying $SCRIPT_DIR/$file to $INSTALL _DIR/opt/minios-live/$file..." >>$OUTPUT 2>&1
cp -f $SCRIPT_DIR/"$file" $BUILD _DIR/opt/minios-live/"$file" >>$OUTPUT 2>&1 cp -f $SCRIPT_DIR/"$file" $INSTALL _DIR/opt/minios-live/"$file" >>$OUTPUT 2>&1
fi fi
done done
fi fi
@ -891,20 +895,20 @@ function build_chroot() {
create_apt_list create_apt_list
if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f /$LIVEKITNAME.log ]; then if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f /$LIVEKITNAME.log ]; then
mv -f /$LIVEKITNAME.log $BUILD _DIR/$LIVEKITNAME.log mv -f /$LIVEKITNAME.log $INSTALL _DIR/$LIVEKITNAME.log
fi fi
if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f $BUILD _DIR/$LIVEKITNAME.log ]; then if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f $INSTALL _DIR/$LIVEKITNAME.log ]; then
echo "===========================================" >>$BUILD _DIR/$LIVEKITNAME.log 2>&1 echo "===========================================" >>$INSTALL _DIR/$LIVEKITNAME.log 2>&1
echo "===========================================" >>$BUILD _DIR/$LIVEKITNAME.log 2>&1 echo "===========================================" >>$INSTALL _DIR/$LIVEKITNAME.log 2>&1
echo "=============== CHROOT LOG ================" >>$BUILD _DIR/$LIVEKITNAME.log 2>&1 echo "=============== CHROOT LOG ================" >>$INSTALL _DIR/$LIVEKITNAME.log 2>&1
echo "===========================================" >>$BUILD _DIR/$LIVEKITNAME.log 2>&1 echo "===========================================" >>$INSTALL _DIR/$LIVEKITNAME.log 2>&1
echo "===========================================" >>$BUILD _DIR/$LIVEKITNAME.log 2>&1 echo "===========================================" >>$INSTALL _DIR/$LIVEKITNAME.log 2>&1
fi fi
cp -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list $BUILD _DIR/etc/apt/sources.list cp -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list $INSTALL _DIR/etc/apt/sources.list
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
chroot $BUILD _DIR /usr/bin/env \ chroot $INSTALL _DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
@ -921,13 +925,13 @@ function build_chroot() {
USER_NAME=$USER_NAME \ USER_NAME=$USER_NAME \
LIVE_TYPE=$LIVE_TYPE /linux-live/install_chroot - LIVE_TYPE=$LIVE_TYPE /linux-live/install_chroot -
else else
chroot $BUILD _DIR /linux-live/install_chroot - chroot $INSTALL _DIR /linux-live/install_chroot -
fi fi
chroot_umount_fs chroot_umount_fs
if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f $BUILD _DIR/$LIVEKITNAME.log ]; then if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f $INSTALL _DIR/$LIVEKITNAME.log ]; then
mv -f $BUILD _DIR/$LIVEKITNAME.log $SCRIPT_DIR/$LIVEKITNAME.log mv -f $INSTALL _DIR/$LIVEKITNAME.log $SCRIPT_DIR/$LIVEKITNAME.log
if [ -f $SCRIPT_DIR/$LIVEKITNAME.log ]; then if [ -f $SCRIPT_DIR/$LIVEKITNAME.log ]; then
echo -e "Installation log was saved to ${MAGENTA}$SCRIPT_DIR/$LIVEKITNAME.log${ENDCOLOUR}" echo -e "Installation log was saved to ${MAGENTA}$SCRIPT_DIR/$LIVEKITNAME.log${ENDCOLOUR}"
fi fi
@ -951,15 +955,15 @@ function build_live() {
copy_build_scripts copy_build_scripts
check_build _dir check_install _dir
rm -rf $PARENT _DIR/image rm -rf $BUILD _DIR/image
mkdir -p $PARENT _DIR/image/$LIVEKITNAME/{boot,changes,modules} mkdir -p $BUILD _DIR/image/$LIVEKITNAME/{boot,changes,modules}
build_boot build_boot
# create compressed 01-core.sb # create compressed 01-core.sb
cd $BUILD _DIR cd $INSTALL _DIR
COREFS="" COREFS=""
for i in $MKMOD; do for i in $MKMOD; do
if [ -d /$i ]; then if [ -d /$i ]; then
@ -968,12 +972,12 @@ function build_live() {
done done
: 'if [ $COMP_TYPE = "zstd" ]; then : 'if [ $COMP_TYPE = "zstd" ]; then
mksquashfs $COREFS $PARENT _DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -keep-as-directory -noappend || exit mksquashfs $COREFS $BUILD _DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -keep-as-directory -noappend || exit
else else
mksquashfs $COREFS $PARENT _DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit mksquashfs $COREFS $BUILD _DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit
fi' fi'
mksquashfs $COREFS $PARENT _DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit mksquashfs $COREFS $BUILD _DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit
}}
@ -993,36 +997,36 @@ function build_boot() {
copy_build_scripts copy_build_scripts
check_build _dir check_install _dir
# initramfs generation # initramfs generation
chroot $BUILD _DIR mount none -t proc /proc chroot $INSTALL _DIR mount none -t proc /proc
chmod +x $BUILD _DIR/linux-live/initrfs chmod +x $INSTALL _DIR/linux-live/initrfs
chroot $BUILD _DIR /linux-live/initrfs chroot $INSTALL _DIR /linux-live/initrfs
chroot $BUILD _DIR umount /proc chroot $INSTALL _DIR umount /proc
# copy kernel files # copy kernel files
cp $BUILD_DIR/boot/vmlinuz-**-**-* $PARENT _DIR/image/$LIVEKITNAME/boot/vmlinuz cp $INSTALL_DIR/boot/vmlinuz-**-**-* $BUILD _DIR/image/$LIVEKITNAME/boot/vmlinuz
cp $BUILD_DIR/boot/initrfs.img $PARENT _DIR/image/$LIVEKITNAME/boot/initrfs.img cp $INSTALL_DIR/boot/initrfs.img $BUILD _DIR/image/$LIVEKITNAME/boot/initrfs.img
#if [ $CLOUD != "true" ]; then #if [ $CLOUD != "true" ]; then
cp -r $SCRIPT_DIR/linux-live/bootfiles/* $PARENT _DIR/image/$LIVEKITNAME cp -r $SCRIPT_DIR/linux-live/bootfiles/* $BUILD _DIR/image/$LIVEKITNAME
#fi #fi
if [ $CLOUD = "true" ]; then if [ $CLOUD = "true" ]; then
BOOT_TYPE="hybrid" BOOT_TYPE="hybrid"
fi fi
if [ $BOOT_TYPE = "hybrid" ]; then if [ $BOOT_TYPE = "hybrid" ]; then
cp -r $SCRIPT_DIR/linux-live/bootfiles-grub/* $PARENT _DIR/image cp -r $SCRIPT_DIR/linux-live/bootfiles-grub/* $BUILD _DIR/image
#cp -r $SCRIPT_DIR/linux-live/bootfiles-hybrid/ $DIR #cp -r $SCRIPT_DIR/linux-live/bootfiles-hybrid/ $DIR
if [ ! -d $PARENT _DIR/image/.disk ]; then if [ ! -d $BUILD _DIR/image/.disk ]; then
mkdir -p $PARENT _DIR/image/.disk mkdir -p $BUILD _DIR/image/.disk
fi fi
echo $SYSTEMNAME >$PARENT _DIR/image/.disk/info echo $SYSTEMNAME >$BUILD _DIR/image/.disk/info
fi fi
if [ $CLOUD = "true" ]; then if [ $CLOUD = "true" ]; then
cat <<'EOF' | iconv -f 'UTF-8' -t "CP866//TRANSLIT" >$PARENT _DIR/image/minios/boot/syslinux.cfg cat <<'EOF' | iconv -f 'UTF-8' -t "CP866//TRANSLIT" >$BUILD _DIR/image/minios/boot/syslinux.cfg
UI /minios/boot/vesamenu.c32UI /minios/boot/vesamenu.c32
PROMPT 0PROMPT 0
@ -1057,7 +1061,7 @@ KERNEL /minios/boot/vmlinuz
APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 apparmor=0 selinux=0 minios.flags=toram net.ifnames=0 biosdevname=0APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 apparmor=0 selinux=0 minios.flags=toram net.ifnames=0 biosdevname=0
EOFEOF
cat <<'EOF' >$PARENT _DIR/image/boot/grub/grub.cfg cat <<'EOF' >$BUILD _DIR/image/boot/grub/grub.cfg
set default="0"set default="0"
set timeout="4"set timeout="4"
set hidden_timeout_quiet=falseset hidden_timeout_quiet=false
@ -1092,11 +1096,11 @@ EOF
fi fi
if [ $PACKAGE_VARIANT = "minimal" ]; then if [ $PACKAGE_VARIANT = "minimal" ]; then
sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $PARENT _DIR/image/$LIVEKITNAME/boot/syslinux.cfg sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $BUILD _DIR/image/$LIVEKITNAME/boot/syslinux.cfg
sed -i 's/minios.flags= /minios.flags=automount /g' $PARENT _DIR/image/$LIVEKITNAME/boot/syslinux.cfg sed -i 's/minios.flags= /minios.flags=automount /g' $BUILD _DIR/image/$LIVEKITNAME/boot/syslinux.cfg
if [ $BOOT_TYPE = "hybrid" ]; then if [ $BOOT_TYPE = "hybrid" ]; then
sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $PARENT _DIR/image/boot/grub/grub.cfg sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $BUILD _DIR/image/boot/grub/grub.cfg
sed -i 's/minios.flags= /minios.flags=automount /g' $PARENT _DIR/image/boot/grub/grub.cfg sed -i 's/minios.flags= /minios.flags=automount /g' $BUILD _DIR/image/boot/grub/grub.cfg
fi fi
fi fi
}}
@ -1113,19 +1117,17 @@ function build_iso() {
fi fi
fi fi
check_build _dir check_install _dir
if [ "$UNATTENDED" = "1" ]; then if [ "$UNATTENDED" = "1" ]; then
BUILD_DIR="/build /$DISTRIBUTION" INSTALL_DIR="$BUILD_DIR /$DISTRIBUTION"
fi fi
if [ "$BUILD _DIR" = "" ]; then if [ "$INSTALL _DIR" = "" ]; then
LAST_BUILD_DIR=$(cat "$SCRIPT_DIR/.build _dir") >>$OUTPUT 2>&1 LAST_INSTALL_DIR=$(cat "$SCRIPT_DIR/.install _dir") >>$OUTPUT 2>&1
BUILD_DIR=$LAST_BUILD _DIR INSTALL_DIR=$LAST_INSTALL _DIR
fi fi
ISO_DIR="/build/template/iso" cd $BUILD_DIR/image
cd $PARENT_DIR/image
if [ ! -d $ISO_DIR ]; then if [ ! -d $ISO_DIR ]; then
mkdir -p $ISO_DIR mkdir -p $ISO_DIR
fi fi
@ -1134,7 +1136,7 @@ function build_iso() {
VER=$SYSTEMVER VER=$SYSTEMVER
DATE=$(date +%Y%m%d_%H%M) DATE=$(date +%Y%m%d_%H%M)
DIR=$PARENT _DIR/image DIR=$BUILD _DIR/image
ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso
B="-b $LIVEKITNAME/boot/isolinux.bin -c $LIVEKITNAME/boot/isolinux.boot" B="-b $LIVEKITNAME/boot/isolinux.bin -c $LIVEKITNAME/boot/isolinux.boot"
@ -1397,7 +1399,7 @@ EOF
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if [ -f $SCRIPT_DIR/pkglists/prereq.list ]; then if [ -f $SCRIPT_DIR/pkglists/prereq.list ]; then
$APT_CMD update $APT_CMD update
echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" && echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" &&
$APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 && $APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 &&
echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" && echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
$APT_CMD install $APT_OPTIONS \ $APT_CMD install $APT_OPTIONS \
@ -1564,7 +1566,7 @@ WantedBy=multi-user.target
WantedBy=network-online.targetWantedBy=network-online.target
EOFEOF
systemctl enable dhclient >>$OUTPUT 2>&1 systemctl enable dhclient >>$OUTPUT 2>&1
elif [ -d /etc/NetworkManager ] && [ $DISTRIBUTION_TYPE = "ubuntu" ]; then elif [ -d /etc/NetworkManager ] && [[ $DISTRIBUTION = "bionic" || $DISTRIBUTION = "focal" ] ]; then
cat <<EOF >/etc/netplan/01-netcfg.yaml cat <<EOF >/etc/netplan/01-netcfg.yaml
# This file describes the network interfaces available on your system# This file describes the network interfaces available on your system
# For more information, see netplan(5).# For more information, see netplan(5).
@ -1769,7 +1771,7 @@ function module_check_mounted() {
##
##
# =================================================================# =================================================================
function module_check_build _dir() {function module_check_install _dir() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ "$UNATTENDED" = "1" ]; then if [ "$UNATTENDED" = "1" ]; then
#echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}" #echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}"
@ -1805,7 +1807,7 @@ function module_chroot_mount_fs() {
if [ $UNION_BUILD_TYPE = "overlayfs" ]; then if [ $UNION_BUILD_TYPE = "overlayfs" ]; then
MODULES_LIST="" MODULES_LIST=""
MODULES=($PARENT _DIR/image/$LIVEKITNAME/*.$BEXT) MODULES=($BUILD _DIR/image/$LIVEKITNAME/*.$BEXT)
for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT) MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
@ -1819,7 +1821,7 @@ function module_chroot_mount_fs() {
mount -t overlay overlay -o lowerdir=$MODULES_LIST,upperdir=$MODULE_UPPER_DIR,workdir=$MODULE_WORK_DIR $MODULE_MERGED_DIR mount -t overlay overlay -o lowerdir=$MODULES_LIST,upperdir=$MODULE_UPPER_DIR,workdir=$MODULE_WORK_DIR $MODULE_MERGED_DIR
elif [ $UNION_BUILD_TYPE = "aufs" ]; then elif [ $UNION_BUILD_TYPE = "aufs" ]; then
MODULES_LIST="" MODULES_LIST=""
MODULES=($PARENT _DIR/image/$LIVEKITNAME/*.$BEXT) MODULES=($BUILD _DIR/image/$LIVEKITNAME/*.$BEXT)
for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT) MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
@ -1852,9 +1854,9 @@ function module_chroot_mount_fs() {
mount --bind /dev $MODULE_MERGED_DIR/dev mount --bind /dev $MODULE_MERGED_DIR/dev
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
if [ -L $MODULE_MERGED_DIR/etc/resolv.conf ]; then if [ -L $MODULE_MERGED_DIR/etc/resolv.conf ] || [ $DISTRIBUTION = "stretch" ] ; then
mv $MODULE_MERGED_DIR/etc/resolv.conf $MODULE_MERGED_DIR/etc/resolv.conf.bak mv $MODULE_MERGED_DIR/etc/resolv.conf $MODULE_MERGED_DIR/etc/resolv.conf.bak
echo "nameserver 8.8.8.8" >$MODULE_MERGED_DIR/etc/resolv.conf echo "nameserver 8.8.8.8" >> $MODULE_MERGED_DIR/etc/resolv.conf
fi fi
: 'if [ ! -d $MODULE_MERGED_DIR/run/resolvconf ]; then : 'if [ ! -d $MODULE_MERGED_DIR/run/resolvconf ]; then
mkdir -p $MODULE_MERGED_DIR/run/resolvconf mkdir -p $MODULE_MERGED_DIR/run/resolvconf
@ -1888,13 +1890,9 @@ function module_chroot_umount_fs() {
umount $MODULE_MERGED_DIR/tmp umount $MODULE_MERGED_DIR/tmp
umount $MODULE_MERGED_DIR/dev umount $MODULE_MERGED_DIR/dev
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
ls -la $MODULE_MERGED_DIR/etc/resolv.* if [[ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak && ! -L $MODULE_MERGED_DIR/etc/resolv.conf ]] || [ $DISTRIBUTION = "stretch" ]; then
if [ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak ] && [ ! -L $MODULE_MERGED_DIR/etc/resolv.conf ]; then
ls -la $MODULE_MERGED_DIR/etc/resolv.*
rm -f $MODULE_MERGED_DIR/etc/resolv.conf rm -f $MODULE_MERGED_DIR/etc/resolv.conf
ls -la $MODULE_MERGED_DIR/etc/resolv.*
mv $MODULE_MERGED_DIR/etc/resolv.conf.bak $MODULE_MERGED_DIR/etc/resolv.conf mv $MODULE_MERGED_DIR/etc/resolv.conf.bak $MODULE_MERGED_DIR/etc/resolv.conf
ls -la $MODULE_MERGED_DIR/etc/resolv.*
elif [ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak ] && [ -L $MODULE_MERGED_DIR/etc/resolv.conf ]; then elif [ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak ] && [ -L $MODULE_MERGED_DIR/etc/resolv.conf ]; then
rm -f $MODULE_MERGED_DIR/etc/resolv.conf.bak rm -f $MODULE_MERGED_DIR/etc/resolv.conf.bak
fi fi
@ -1917,7 +1915,7 @@ function module_chroot_umount_fs() {
umount $MODULE_MERGED_DIR/tmp >>$OUTPUT 2>&1 umount $MODULE_MERGED_DIR/tmp >>$OUTPUT 2>&1
umount $MODULE_MERGED_DIR/dev >>$OUTPUT 2>&1 umount $MODULE_MERGED_DIR/dev >>$OUTPUT 2>&1
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
if [ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak ] && [ ! -L $MODULE_MERGED_DIR/etc/resolv.conf ]; then if [[ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak && ! -L $MODULE_MERGED_DIR/etc/resolv.conf ]] || [ $DISTRIBUTION = "stretch" ]; then
rm -f $MODULE_UPPER_DIR/etc/resolv.conf rm -f $MODULE_UPPER_DIR/etc/resolv.conf
mv $MODULE_MERGED_DIR/etc/resolv.conf.bak $MODULE_MERGED_DIR/etc/resolv.conf mv $MODULE_MERGED_DIR/etc/resolv.conf.bak $MODULE_MERGED_DIR/etc/resolv.conf
elif [ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak ] && [ -L $MODULE_MERGED_DIR/etc/resolv.conf ]; then elif [ -L $MODULE_MERGED_DIR/etc/resolv.conf.bak ] && [ -L $MODULE_MERGED_DIR/etc/resolv.conf ]; then
@ -1937,7 +1935,7 @@ function module_chroot_umount_fs() {
fi fi
fi fi
MODULES=($PARENT _DIR/image/$LIVEKITNAME/*.$BEXT) MODULES=($BUILD _DIR/image/$LIVEKITNAME/*.$BEXT)
for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT) MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
umount $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower umount $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
@ -2289,45 +2287,42 @@ function build_modules() {
fi fi
fi fi
MODULES_DIR=$PARENT _DIR/modules MODULES_DIR=$BUILD _DIR/modules
cd $SCRIPT_DIR/linux-live/modules cd $SCRIPT_DIR/linux-live/modules
for MODULE in *; do for MODULE in *; do
if (ls $PARENT _DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then if (ls $BUILD _DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
echo -e "Please remove ${MAGENTA}$PARENT _DIR/image/$LIVEKITNAME/$MODULE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}." echo -e "Please remove ${MAGENTA}$BUILD _DIR/image/$LIVEKITNAME/$MODULE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}."
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
else else
MODULE_UPPER_DIR="$MODULES_DIR/$MODULE-upper" MODULE_UPPER_DIR="$MODULES_DIR/$MODULE-upper"
MODULE_WORK_DIR="$MODULES_DIR/$MODULE-work" MODULE_WORK_DIR="$MODULES_DIR/$MODULE-work"
MODULE_MERGED_DIR="$MODULES_DIR/$MODULE-merged" MODULE_MERGED_DIR="$MODULES_DIR/$MODULE-merged"
module_check_build _dir module_check_install _dir
module_chroot_mount_fs module_chroot_mount_fs
chroot $MODULE_MERGED_DIR /usr/bin/env \ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
OUTPUT=$OUTPUT \ chroot $MODULE_MERGED_DIR /usr/bin/env \
LOGPATH=$LOGPATH \ OUTPUT=$OUTPUT \
BUILD_TEST_ISO=$BUILD_TEST_ISO \ LOGPATH=$LOGPATH \
CREATE_BACKUP=$CREATE_BACKUP \ BUILD_TEST_ISO=$BUILD_TEST_ISO \
DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \ CREATE_BACKUP=$CREATE_BACKUP \
APT_CMD=$APT_CMD \ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
APT_OPTIONS=$APT_OPTIONS \ APT_CMD=$APT_CMD \
LIVE_TYPE=$LIVE_TYPE \ APT_OPTIONS=$APT_OPTIONS \
DISTRIBUTION=$DISTRIBUTION \ LIVE_TYPE=$LIVE_TYPE \
DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE \ DISTRIBUTION=$DISTRIBUTION \
PACKAGE_VARIANT=$PACKAGE_VARIANT \ DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE \
COMP_TYPE=$COMP_TYPE \ PACKAGE_VARIANT=$PACKAGE_VARIANT \
KERNEL_ARCH=$KERNEL_ARCH \ COMP_TYPE=$COMP_TYPE \
USER_NAME=$USER_NAME \ KERNEL_ARCH=$KERNEL_ARCH \
$APT_CMD update >>$OUTPUT 2>&1 USER_NAME=$USER_NAME \
$APT_CMD update
# run pre-install script else
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot $MODULE_MERGED_DIR /usr/bin/env \ chroot $MODULE_MERGED_DIR /usr/bin/env \
OUTPUT=$OUTPUT \ OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \ LOGPATH=$LOGPATH \
@ -2343,7 +2338,50 @@ function build_modules() {
COMP_TYPE=$COMP_TYPE \ COMP_TYPE=$COMP_TYPE \
KERNEL_ARCH=$KERNEL_ARCH \ KERNEL_ARCH=$KERNEL_ARCH \
USER_NAME=$USER_NAME \ USER_NAME=$USER_NAME \
/preinstall >>$OUTPUT 2>&1 $APT_CMD update >>$OUTPUT 2>&1
fi
# run pre-install script
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot $MODULE_MERGED_DIR /usr/bin/env \
OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \
CREATE_BACKUP=$CREATE_BACKUP \
DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
APT_CMD=$APT_CMD \
APT_OPTIONS=$APT_OPTIONS \
LIVE_TYPE=$LIVE_TYPE \
DISTRIBUTION=$DISTRIBUTION \
DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE \
PACKAGE_VARIANT=$PACKAGE_VARIANT \
COMP_TYPE=$COMP_TYPE \
KERNEL_ARCH=$KERNEL_ARCH \
USER_NAME=$USER_NAME \
/preinstall
else
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot $MODULE_MERGED_DIR /usr/bin/env \
OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \
BUILD_TEST_ISO=$BUILD_TEST_ISO \
CREATE_BACKUP=$CREATE_BACKUP \
DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
APT_CMD=$APT_CMD \
APT_OPTIONS=$APT_OPTIONS \
LIVE_TYPE=$LIVE_TYPE \
DISTRIBUTION=$DISTRIBUTION \
DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE \
PACKAGE_VARIANT=$PACKAGE_VARIANT \
COMP_TYPE=$COMP_TYPE \
KERNEL_ARCH=$KERNEL_ARCH \
USER_NAME=$USER_NAME \
/preinstall >>$OUTPUT 2>&1
fi
fi fi
# copy files # copy files
@ -2426,16 +2464,16 @@ function build_modules() {
# run external actions # run external actions
if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
mkdir -p $PARENT _DIR/modules/tmp >>$OUTPUT 2>&1 mkdir -p $BUILD _DIR/modules/tmp >>$OUTPUT 2>&1
mksquashfs $MODULE_UPPER_DIR $PARENT _DIR/modules/tmp/$MODULE-stock.$BEXT -comp lz4 -b 1024K -always-use-fragments -noappend >>$OUTPUT 2>&1 || exit mksquashfs $MODULE_UPPER_DIR $BUILD _DIR/modules/tmp/$MODULE-stock.$BEXT -comp lz4 -b 1024K -always-use-fragments -noappend >>$OUTPUT 2>&1 || exit
mv $PARENT _DIR/modules/tmp/$MODULE-stock.$BEXT $MODULE_UPPER_DIR/$MODULE-stock.$BEXT >>$OUTPUT 2>&1 mv $BUILD _DIR/modules/tmp/$MODULE-stock.$BEXT $MODULE_UPPER_DIR/$MODULE-stock.$BEXT >>$OUTPUT 2>&1
cd $MODULE_UPPER_DIR >>$OUTPUT 2>&1 cd $MODULE_UPPER_DIR >>$OUTPUT 2>&1
unsquashfs $MODULE-stock.$BEXT >>$OUTPUT 2>&1 unsquashfs $MODULE-stock.$BEXT >>$OUTPUT 2>&1
else else
echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do." echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do."
fi fi
#module_check_build _dir #module_check_install _dir
module_chroot_mount_fs module_chroot_mount_fs
fi fi
@ -2553,7 +2591,7 @@ function build_modules() {
# run external actions # run external actions
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
cp $MODULE_UPPER_DIR/$MODULE.$BEXT $PARENT _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT >>$OUTPUT 2>&1 cp $MODULE_UPPER_DIR/$MODULE.$BEXT $BUILD _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT >>$OUTPUT 2>&1
fi fi
module_chroot_finish_up module_chroot_finish_up
@ -2567,19 +2605,19 @@ function build_modules() {
module_chroot_cleanup module_chroot_cleanup
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ ! -f $PARENT _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT ]; then if [ ! -f $BUILD _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT ]; then
if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
if [ $COMP_TYPE = "zstd" ]; then if [ $COMP_TYPE = "zstd" ]; then
mksquashfs $MODULE_UPPER_DIR $PARENT _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -noappend || exit mksquashfs $MODULE_UPPER_DIR $BUILD _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -noappend || exit
else else
mksquashfs $MODULE_UPPER_DIR $PARENT _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit mksquashfs $MODULE_UPPER_DIR $BUILD _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
fi fi
else else
echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do." echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do."
fi fi
else else
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
echo -e "Please remove ${MAGENTA}$PARENT _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}." echo -e "Please remove ${MAGENTA}$BUILD _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}."
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
fi fi
fi fi
@ -2602,15 +2640,15 @@ function build_modules_live() {
fi fi
fi fi
MODULES_DIR=$PARENT _DIR/modules MODULES_DIR=$BUILD _DIR/modules
cd $SCRIPT_DIR/linux-live/modules cd $SCRIPT_DIR/linux-live/modules
for MODULE in *; do for MODULE in *; do
if (ls $PARENT _DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then if (ls $BUILD _DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
echo -e "Please remove ${MAGENTA}$PARENT _DIR/image/$LIVEKITNAME/$MODULE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}." echo -e "Please remove ${MAGENTA}$BUILD _DIR/image/$LIVEKITNAME/$MODULE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}."
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
else else
@ -2620,9 +2658,9 @@ function build_modules_live() {
if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
if [ $COMP_TYPE = "zstd" ]; then if [ $COMP_TYPE = "zstd" ]; then
mksquashfs $MODULE_UPPER_DIR $PARENT _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -noappend || exit mksquashfs $MODULE_UPPER_DIR $BUILD _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -noappend || exit
else else
mksquashfs $MODULE_UPPER_DIR $PARENT _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit mksquashfs $MODULE_UPPER_DIR $BUILD _DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
fi fi
else else
echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do." echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do."
@ -2648,7 +2686,7 @@ function repack_module() {
function repack_modules() {function repack_modules() {
current_process current_process
cd $PARENT _DIR/image/$LIVEKITNAME/ cd $BUILD _DIR/image/$LIVEKITNAME/
for MODULE in *; do for MODULE in *; do
if (ls ./*-xz.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then if (ls ./*-xz.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
OLD_COMP_TYPE="xz" OLD_COMP_TYPE="xz"
crims0n
4 years ago