ANSI colors are not supported anymore.
--HG-- extra : convert_revision : d9e7bfcb963a0bf6dff276e8d15b0df22de24143
This commit is contained in:
parent
de67397983
commit
5638a5a4e5
|
@ -29,9 +29,7 @@ if [ ! -f $XBPS_MASTERDIR/.xbps_perms_done ]; then
|
||||||
chmod +s $XBPS_MASTERDIR/usr/libexec/pt_chown
|
chmod +s $XBPS_MASTERDIR/usr/libexec/pt_chown
|
||||||
cp -af /etc/passwd /etc/shadow /etc/group /etc/hosts /etc/resolv.conf $XBPS_MASTERDIR/etc
|
cp -af /etc/passwd /etc/shadow /etc/group /etc/hosts /etc/resolv.conf $XBPS_MASTERDIR/etc
|
||||||
touch $XBPS_MASTERDIR/.xbps_perms_done
|
touch $XBPS_MASTERDIR/.xbps_perms_done
|
||||||
set_color bold
|
|
||||||
echo "done."
|
echo "done."
|
||||||
restore_color
|
|
||||||
else
|
else
|
||||||
msg_normal "Entering into the chroot on $XBPS_MASTERDIR."
|
msg_normal "Entering into the chroot on $XBPS_MASTERDIR."
|
||||||
fi
|
fi
|
||||||
|
@ -58,14 +56,9 @@ for f in ${REQFS}; do
|
||||||
mount --bind $blah $XBPS_MASTERDIR/$f
|
mount --bind $blah $XBPS_MASTERDIR/$f
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
touch $XBPS_MASTERDIR/.${f}_mount_bind_done
|
touch $XBPS_MASTERDIR/.${f}_mount_bind_done
|
||||||
set_color bold
|
|
||||||
echo "done."
|
echo "done."
|
||||||
restore_color
|
|
||||||
else
|
else
|
||||||
set_color red
|
|
||||||
set_color bold
|
|
||||||
echo "failed."
|
echo "failed."
|
||||||
restore_color
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -87,9 +80,7 @@ rebuild_ldso_cache()
|
||||||
echo -n "==> Rebuilding chroot's dynamic linker cache..."
|
echo -n "==> Rebuilding chroot's dynamic linker cache..."
|
||||||
chroot $XBPS_MASTERDIR /sbin/ldconfig -c /etc/ld.so.conf
|
chroot $XBPS_MASTERDIR /sbin/ldconfig -c /etc/ld.so.conf
|
||||||
chroot $XBPS_MASTERDIR /sbin/ldconfig -C /etc/ld.so.cache
|
chroot $XBPS_MASTERDIR /sbin/ldconfig -C /etc/ld.so.cache
|
||||||
set_color bold
|
|
||||||
echo " done."
|
echo " done."
|
||||||
restore_color
|
|
||||||
}
|
}
|
||||||
|
|
||||||
chroot_pkg_handler()
|
chroot_pkg_handler()
|
||||||
|
@ -124,14 +115,9 @@ umount_chroot_fs()
|
||||||
umount -f $XBPS_MASTERDIR/$fs
|
umount -f $XBPS_MASTERDIR/$fs
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
rm -f $XBPS_MASTERDIR/.${fs}_mount_bind_done
|
rm -f $XBPS_MASTERDIR/.${fs}_mount_bind_done
|
||||||
set_color bold
|
|
||||||
echo "done."
|
echo "done."
|
||||||
restore_color
|
|
||||||
else
|
else
|
||||||
set_color red
|
|
||||||
set_color bold
|
|
||||||
echo "failed."
|
echo "failed."
|
||||||
restore_color
|
|
||||||
fi
|
fi
|
||||||
unset fs
|
unset fs
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue