From e03b9539e946803923267b1e60bfc450b5a918f9 Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 1 Aug 2020 15:11:02 -0400 Subject: sync mkparabolaiso and initcpios with archiso v46 Signed-off-by: David P --- parabolaiso/mkparabolaiso | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'parabolaiso/mkparabolaiso') diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 751bd1e..f3a9765 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -1,4 +1,6 @@ #!/bin/bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u @@ -43,13 +45,11 @@ _msg_error() { } _chroot_init() { - local common="base syslinux linux-libre elogind libelogind" - mkdir -p ${work_dir}/airootfs case $init in - openrc) _pacman openrc-init $common ;; - sysvinit) _pacman openrc-sysvinit $common ;; - systemd) _pacman base syslinux linux-libre ;; + openrc) _pacman base syslinux openrc-init ;; + sysvinit) _pacman base syslinux openrc-sysvinit ;; + systemd) _pacman base syslinux ;; esac } @@ -236,7 +236,7 @@ _mkairootfs_img () { -comp "${sfs_comp}" -no-progress &> /dev/null else mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ - -comp "${sfs_comp}" -no-progress + -comp "${sfs_comp}" fi _msg_info "Done!" rm "${work_dir}/airootfs.img" @@ -255,7 +255,7 @@ _mkairootfs_sfs () { -comp "${sfs_comp}" -no-progress &> /dev/null else mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ - -comp "${sfs_comp}" -no-progress + -comp "${sfs_comp}" fi _msg_info "Done!" } -- cgit v1.2.2