diff options
Diffstat (limited to 'bin/tcos-buildchroot')
| -rwxr-xr-x | bin/tcos-buildchroot | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/bin/tcos-buildchroot b/bin/tcos-buildchroot index 3afc892..8d6450c 100755 --- a/bin/tcos-buildchroot +++ b/bin/tcos-buildchroot @@ -179,13 +179,13 @@ chrootcreate() { --divert /usr/sbin/invoke-rc.d.original \ /usr/sbin/invoke-rc.d - # avoid calling udevadm inside chroot - # http://bugs.debian.org/627790 - chroot ${TCOS_CHROOT} dpkg-divert --package initramfs-tools-tcos \ - --add --rename --quiet \ - --divert /sbin/udevadm.original \ - /sbin/udevadm - createEmptyCMD /sbin/udevadm +# # avoid calling udevadm inside chroot +# # http://bugs.debian.org/627790 +# chroot ${TCOS_CHROOT} dpkg-divert --package initramfs-tools-tcos \ +# --add --rename --quiet \ +# --divert /sbin/udevadm.original \ +# /sbin/udevadm +# createEmptyCMD /sbin/udevadm cat << EOF > ${TCOS_CHROOT}/etc/apt/apt.conf @@ -282,23 +282,24 @@ cat /etc/resolv.conf > ${TCOS_CHROOT}/etc/resolv.conf [ ! -e ${TCOS_CHROOT}/sbin/start-stop-daemon ] && createEmptyCMD /sbin/start-stop-daemon [ ! -e ${TCOS_CHROOT}/usr/sbin/invoke-rc.d ] && createEmptyCMD /usr/sbin/invoke-rc.d -if [ ! -e /sbin/udevadm.original ]; then - chroot ${TCOS_CHROOT} dpkg-divert --package initramfs-tools-tcos \ - --add --rename --quiet \ - --divert /sbin/udevadm.original \ - /sbin/udevadm - createEmptyCMD /sbin/udevadm -fi +#if [ ! -e /sbin/udevadm.original ]; then +# chroot ${TCOS_CHROOT} dpkg-divert --package initramfs-tools-tcos \ +# --add --rename --quiet \ +# --divert /sbin/udevadm.original \ +# /sbin/udevadm +# createEmptyCMD /sbin/udevadm +#fi } chrootexit() { -if [ -e ${TCOS_CHROOT}/sbin/udevadm.original ]; then - rm -f ${TCOS_CHROOT}/sbin/udevadm - chroot ${TCOS_CHROOT} dpkg-divert --package initramfs-tools-tcos \ - --remove --rename --quiet \ - --divert /sbin/udevadm.original \ - /sbin/udevadm -fi +return +#if [ -e ${TCOS_CHROOT}/sbin/udevadm.original ]; then +# rm -f ${TCOS_CHROOT}/sbin/udevadm +# chroot ${TCOS_CHROOT} dpkg-divert --package initramfs-tools-tcos \ +# --remove --rename --quiet \ +# --divert /sbin/udevadm.original \ +# /sbin/udevadm +#fi } chrootupdate() { @@ -313,9 +314,14 @@ if [ -e /etc/console-setup/boottime.kmap.gz ]; then mkdir -p ${TCOS_CHROOT}/etc/console-setup cp /etc/console-setup/boottime.kmap.gz ${TCOS_CHROOT}/etc/console-setup/ fi -if [ -e /etc/console-setup/cached.kmap.gz ]; then +if [ -e /etc/console-setup/cached*.kmap.gz ]; then + mkdir -p ${TCOS_CHROOT}/etc/console-setup + cp /etc/console-setup/cached*.kmap.gz ${TCOS_CHROOT}/etc/console-setup/ +fi + +if [ -e /etc/console-setup/cached_UTF-8_del.kmap.gz ]; then mkdir -p ${TCOS_CHROOT}/etc/console-setup - cp /etc/console-setup/cached.kmap.gz ${TCOS_CHROOT}/etc/console-setup/ + cp /etc/console-setup/cached_UTF-8_del.kmap.gz ${TCOS_CHROOT}/etc/console-setup/ fi cat << EOC | chroot ${TCOS_CHROOT} |