progress
This commit is contained in:
parent
7fe80823b7
commit
a1b6e9fefb
3
etc/base
3
etc/base
|
@ -84,11 +84,12 @@ echo " done" >> /etc/runit/core-services/99-changepwuser.sh
|
|||
echo " rm -rf /etc/runit/core-services/99-changepwuser.sh" >> /etc/runit/core-services/99-changepwuser.sh
|
||||
echo "fi" >> /etc/runit/core-services/99-changepwuser.sh
|
||||
|
||||
touch /etc/xbps.d/10-ignore-firmware.conf
|
||||
{ echo "#ignorepkg=linux-firmware-amd";
|
||||
echo "#ignorepkg=linux-firmware-intel";
|
||||
echo "#ignorepkg=linux-firmware-nvidia";
|
||||
echo "#ignorepkg=linux-firmware-broadcom";
|
||||
echo "#ignorepkg=wifi-firmware"; } > /etc/xbps.d/10-ignore-firmware.conf
|
||||
echo "#ignorepkg=wifi-firmware"; } >> /etc/xbps.d/10-ignore-firmware.conf
|
||||
chmod 755 /etc/xbps.d/10-ignore-firmware.conf
|
||||
|
||||
cp -a /etc/profile.d/locale.sh /etc/profile.d/zz-locale-user.sh
|
||||
|
|
|
@ -135,12 +135,7 @@ readin() {
|
|||
}
|
||||
|
||||
ignorepkg() {
|
||||
local input=( ${@} )
|
||||
for i in $(seq 0 "$(( ${#input[@]} - 1 ))"); do
|
||||
touch "${target}"/etc/xbps.d/10-ignore-pkg.conf
|
||||
if ! grep -q "${i}" "${target}"/etc/xbps.d/10-ignore-pkg.conf; then
|
||||
echo "ignorepkg=${i}" >> "${target}"/etc/xbps.d/10-ignore-pkg.conf
|
||||
fi
|
||||
|
||||
for i in $@; do
|
||||
ignorepkgs+=( "$i" )
|
||||
done
|
||||
}
|
||||
|
|
4
main.sh
4
main.sh
|
@ -229,6 +229,10 @@ do_install() {
|
|||
header "Installation"
|
||||
mkdir -p "${target}/var/db/xbps/keys"
|
||||
cp /var/db/xbps/keys/* "${target}/var/db/xbps/keys"
|
||||
touch "${target}/etc/xbps.d/10-ignore-pkg.conf"
|
||||
for i in "${ignorepkgs[@]}"; do
|
||||
echo "ignorepkg=${i}" >> "${target}/etc/xbps.d/10-ignore-pkg.conf"
|
||||
fi
|
||||
xbps-install -Sy -R https://alpha.de.repo.voidlinux.org/current -r "${target}" "${pkgs[@]}"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user