mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
remove init initramdisk if not requested in archboot-*-iso.sh
This commit is contained in:
parent
234abe2c4e
commit
3f1c9d2fad
2 changed files with 10 additions and 6 deletions
|
@ -15,6 +15,7 @@ _usage () {
|
||||||
echo " /etc/archboot/presets locates the presets"
|
echo " /etc/archboot/presets locates the presets"
|
||||||
echo " default=${_ARCH}"
|
echo " default=${_ARCH}"
|
||||||
echo " -i=IMAGENAME Your IMAGENAME."
|
echo " -i=IMAGENAME Your IMAGENAME."
|
||||||
|
echo " -s Save init ramdisk to $(pwd)"
|
||||||
echo " -h This message."
|
echo " -h This message."
|
||||||
echo ""
|
echo ""
|
||||||
echo "usage: ${_BASENAME} <options>"
|
echo "usage: ${_BASENAME} <options>"
|
||||||
|
@ -25,6 +26,7 @@ _parameters() {
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case ${1} in
|
case ${1} in
|
||||||
-g|--g) export _GENERATE="1" ;;
|
-g|--g) export _GENERATE="1" ;;
|
||||||
|
-s|--s) _SAVE_INIT="1" ;;
|
||||||
-p=*|--p=*) _PRESET="$(echo "${1}" | awk -F= '{print $2;}')" ;;
|
-p=*|--p=*) _PRESET="$(echo "${1}" | awk -F= '{print $2;}')" ;;
|
||||||
-i=*|--i=*) _IMAGENAME="$(echo "${1}" | awk -F= '{print $2;}')" ;;
|
-i=*|--i=*) _IMAGENAME="$(echo "${1}" | awk -F= '{print $2;}')" ;;
|
||||||
-h|--h|?) _usage ;;
|
-h|--h|?) _usage ;;
|
||||||
|
@ -71,8 +73,10 @@ _prepare_kernel_initramfs_files() {
|
||||||
echo "Running archboot-cpio.sh for init-${_ARCH}.img..."
|
echo "Running archboot-cpio.sh for init-${_ARCH}.img..."
|
||||||
archboot-cpio.sh -c "/etc/archboot/${_ARCH}-init.conf" -k "${ALL_kver}" -g "${_ISODIR}/boot/init-${_ARCH}.img" || exit 1
|
archboot-cpio.sh -c "/etc/archboot/${_ARCH}-init.conf" -k "${ALL_kver}" -g "${_ISODIR}/boot/init-${_ARCH}.img" || exit 1
|
||||||
# save init ramdisk for further images
|
# save init ramdisk for further images
|
||||||
|
if [[ -n "${_SAVE_INIT}" ]]; then
|
||||||
cp "${_ISODIR}/boot/init-${_ARCH}.img" ./
|
cp "${_ISODIR}/boot/init-${_ARCH}.img" ./
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
echo "Running archboot-cpio.sh for initramfs-${_ARCH}.img..."
|
echo "Running archboot-cpio.sh for initramfs-${_ARCH}.img..."
|
||||||
#shellcheck disable=SC2154
|
#shellcheck disable=SC2154
|
||||||
archboot-cpio.sh -c "${MKINITCPIO_CONFIG}" -k "${ALL_kver}" -g "${_ISODIR}/boot/initramfs-${_ARCH}.img" || exit 1
|
archboot-cpio.sh -c "${MKINITCPIO_CONFIG}" -k "${ALL_kver}" -g "${_ISODIR}/boot/initramfs-${_ARCH}.img" || exit 1
|
||||||
|
|
|
@ -43,12 +43,12 @@ _create_iso() {
|
||||||
${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>/dev/null
|
${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>/dev/null
|
||||||
echo "Generating local ISO..."
|
echo "Generating local ISO..."
|
||||||
# generate local iso in container
|
# generate local iso in container
|
||||||
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -p=${_PRESET_LOCAL} \
|
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -s \
|
||||||
-i=${_ISONAME}-local-${_ARCH}" || exit 1
|
-p=${_PRESET_LOCAL} -i=${_ISONAME}-local-${_ARCH}" || exit 1
|
||||||
echo "Generating latest ISO..."
|
echo "Generating latest ISO..."
|
||||||
# generate latest iso in container
|
# generate latest iso in container
|
||||||
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -p=${_PRESET_LATEST} \
|
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g \
|
||||||
-i=${_ISONAME}-latest-${_ARCH}" || exit 1
|
-p=${_PRESET_LATEST} -i=${_ISONAME}-latest-${_ARCH}" || exit 1
|
||||||
echo "Installing lvm2 to container ${_W_DIR}..."
|
echo "Installing lvm2 to container ${_W_DIR}..."
|
||||||
${_NSPAWN} "${_W_DIR}" pacman -Sy lvm2 --noconfirm &>/dev/null
|
${_NSPAWN} "${_W_DIR}" pacman -Sy lvm2 --noconfirm &>/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue