teldra/vinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progress

Browse Source
This commit is contained in:
teldra 2022-02-08 19:59:23 +01:00
parent 7fe80823b7
commit a1b6e9fefb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/base
View File

@ -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 " 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 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-amd";
echo "#ignorepkg=linux-firmware-intel"; echo "#ignorepkg=linux-firmware-intel";
echo "#ignorepkg=linux-firmware-nvidia"; echo "#ignorepkg=linux-firmware-nvidia";
echo "#ignorepkg=linux-firmware-broadcom"; 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 chmod 755 /etc/xbps.d/10-ignore-firmware.conf
cp -a /etc/profile.d/locale.sh /etc/profile.d/zz-locale-user.sh cp -a /etc/profile.d/locale.sh /etc/profile.d/zz-locale-user.sh

9
etc/functions
View File

@ -135,12 +135,7 @@ readin() {
} }
ignorepkg() { ignorepkg() {
local input=( ${@} ) for i in $@; do
for i in $(seq 0 "$(( ${#input[@]} - 1 ))"); do ignorepkgs+=( "$i" )
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
done done
} }

4
main.sh
View File

@ -229,6 +229,10 @@ do_install() {
header "Installation" header "Installation"
mkdir -p "${target}/var/db/xbps/keys" mkdir -p "${target}/var/db/xbps/keys"
cp /var/db/xbps/keys/* "${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[@]}" xbps-install -Sy -R https://alpha.de.repo.voidlinux.org/current -r "${target}" "${pkgs[@]}"
} }