mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
remove cleanup
This commit is contained in:
parent
f77c05cf16
commit
9ad68e0e17
2 changed files with 2 additions and 2 deletions
|
@ -91,7 +91,7 @@ if [[ "${_L_COMPLETE}" == "1" || "${_L_INSTALL_COMPLETE}" == "1" ]]; then
|
||||||
cp "${_W_DIR}"/usr/lib/initcpio/functions "${_W_DIR}"/usr/lib/initcpio/functions.old
|
cp "${_W_DIR}"/usr/lib/initcpio/functions "${_W_DIR}"/usr/lib/initcpio/functions.old
|
||||||
cp "${_W_DIR}"/usr/share/archboot/patches/31-initcpio.functions.fixed "${_W_DIR}"/usr/lib/initcpio/functions
|
cp "${_W_DIR}"/usr/share/archboot/patches/31-initcpio.functions.fixed "${_W_DIR}"/usr/lib/initcpio/functions
|
||||||
# switch compression
|
# switch compression
|
||||||
systemd-nspawn -D "${_W_DIR}" /bin/bash -c "rm /var/cache/pacman/pkg/archboot-*; umount /tmp; mkinitcpio -c ${_CONFIG} -g /tmp/initrd.img; mv /tmp/initrd.img /" >/dev/tty7 2>&1 || exit 1
|
systemd-nspawn -D "${_W_DIR}" /bin/bash -c "umount /tmp; mkinitcpio -c ${_CONFIG} -g /tmp/initrd.img; mv /tmp/initrd.img /" >/dev/tty7 2>&1 || exit 1
|
||||||
mv "${_W_DIR}"/usr/lib/initcpio/functions.old "${_W_DIR}"/usr/lib/initcpio/functions
|
mv "${_W_DIR}"/usr/lib/initcpio/functions.old "${_W_DIR}"/usr/lib/initcpio/functions
|
||||||
echo "Step 4/6: Moving initramfs files from ${_W_DIR} to / ..."
|
echo "Step 4/6: Moving initramfs files from ${_W_DIR} to / ..."
|
||||||
mv "${_W_DIR}"/initrd.img / || exit 1
|
mv "${_W_DIR}"/initrd.img / || exit 1
|
||||||
|
|
|
@ -57,7 +57,7 @@ mount udev "${_DIR}/dev" -t devtmpfs -o mode=0755,nosuid
|
||||||
mount devpts "${_DIR}/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec
|
mount devpts "${_DIR}/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec
|
||||||
mount shm "${_DIR}/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev
|
mount shm "${_DIR}/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev
|
||||||
# install archboot
|
# install archboot
|
||||||
echo "Installing packages base firmware and archboot to ${_DIR} ..."
|
echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..."
|
||||||
pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1
|
pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1
|
||||||
echo "Installing archboot to ${_DIR} ..."
|
echo "Installing archboot to ${_DIR} ..."
|
||||||
pacman --root "${_DIR}" -Sy archboot --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
|
pacman --root "${_DIR}" -Sy archboot --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
|
||||||
|
|
Loading…
Reference in a new issue