Commit 50237442 authored by Dan Johansen's avatar Dan Johansen

[buildrootfs] don't replace the hosts mirrorlist file, since it does nothing

parent 0a44a3d9
......@@ -17,13 +17,6 @@ fi
create_rootfs () {
msg "Creating rootfs..."
# backup host mirrorlist
mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist-orig
# Create arm mirrorlist
echo "Server = https://manjaro-arm.moson.eu/stable/\$arch/\$repo/" > mirrorlist
mv mirrorlist /etc/pacman.d/mirrorlist
# Remove old rootfs if it exists
if [ -d $BUILDDIR/$ARCH ]; then
echo "Removing old rootfs..."
......@@ -44,10 +37,6 @@ create_rootfs () {
rm -f $BUILDDIR/$ARCH/etc/ca-certificates/extracted/tls-ca-bundle.pem
cp -a /etc/ssl/certs/ca-certificates.crt $BUILDDIR/$ARCH/etc/ssl/certs/
cp -a /etc/ca-certificates/extracted/tls-ca-bundle.pem $BUILDDIR/$ARCH/etc/ca-certificates/extracted/
# restore original mirrorlist to host system
mv /etc/pacman.d/mirrorlist-orig /etc/pacman.d/mirrorlist
pacman -Syy
}
compress_rootfs () {
......@@ -71,7 +60,6 @@ while getopts "${opt}" arg; do
exit 1
;;
h|?)
# echo "-a <arch> Architecture"
echo "-h <help> This help"
exit 1
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment