Author: alexander
Date: 2006-07-10 07:34:36 -0600 (Mon, 10 Jul 2006)
New Revision: 1595
Modified:
trunk/etc/inittab
trunk/packages/kbd/Makefile
Log:
Moved console data to /lib/kbd.
Moved programs used by the console script to /bin.
Modified: trunk/etc/inittab
===================================================================
--- trunk/etc/inittab 2006-07-10 04:18:23 UTC (rev 1594)
+++ trunk/etc/inittab 2006-07-10 13:34:36 UTC (rev 1595)
@@ -17,11 +17,11 @@
su:S1:once:/sbin/sulogin
sd:06:once:/usr/bin/shutdown-helper
-1:2345:respawn:/usr/bin/openvt -f -c 1 -e -w -- /usr/bin/livecd-login
-2:2345:respawn:/usr/bin/openvt -f -c 2 -e -w -- /usr/bin/livecd-login
-3:2345:respawn:/usr/bin/openvt -f -c 3 -e -w -- /usr/bin/livecd-login
-4:2345:respawn:/usr/bin/openvt -f -c 4 -e -w -- /usr/bin/livecd-login
-5:2345:respawn:/usr/bin/openvt -f -c 5 -e -w -- /usr/bin/livecd-login
-6:2345:respawn:/usr/bin/openvt -f -c 6 -e -w -- /usr/bin/livecd-login
+1:2345:respawn:/bin/openvt -f -c 1 -e -w -- /usr/bin/livecd-login
+2:2345:respawn:/bin/openvt -f -c 2 -e -w -- /usr/bin/livecd-login
+3:2345:respawn:/bin/openvt -f -c 3 -e -w -- /usr/bin/livecd-login
+4:2345:respawn:/bin/openvt -f -c 4 -e -w -- /usr/bin/livecd-login
+5:2345:respawn:/bin/openvt -f -c 5 -e -w -- /usr/bin/livecd-login
+6:2345:respawn:/bin/openvt -f -c 6 -e -w -- /usr/bin/livecd-login
# End /etc/inittab
Modified: trunk/packages/kbd/Makefile
===================================================================
--- trunk/packages/kbd/Makefile 2006-07-10 04:18:23 UTC (rev 1594)
+++ trunk/packages/kbd/Makefile 2006-07-10 13:34:36 UTC (rev 1595)
@@ -55,21 +55,22 @@
ifeq ($(LFS-ARCH),sparc)
patch -Np1 -i ../$(PATCH30)
endif
- ./configure
+ ./configure --datadir=/lib/kbd
make $(PM)
make install
+ mv /usr/bin/{setfont,kbd_mode,openvt} /bin
# Turkish fixup
- cp /usr/share/kbd/consoletrans/cp857_to_uni.trans
/usr/share/kbd/unimaps/cp857.uni
+ cp /lib/kbd/consoletrans/cp857_to_uni.trans /lib/kbd/unimaps/cp857.uni
# Thai fonts and keymaps
gzip ../thai-console-data/consolefonts/*.psf
- install -m644 ../thai-console-data/consolefonts/*.psf.gz
/usr/share/kbd/consolefonts
- install -m644 ../thai-console-data/consoletrans/tis620.acm
/usr/share/kbd/consoletrans/tis620_to_uni.trans
+ install -m644 ../thai-console-data/consolefonts/*.psf.gz
/lib/kbd/consolefonts
+ install -m644 ../thai-console-data/consoletrans/tis620.acm
/lib/kbd/consoletrans/tis620_to_uni.trans
for a in ../thai-console-data/keymaps/*.kmap \
../thai-console-data/keymaps/experimental/*.kmap ; do \
mv $${a} $${a%kmap}map ; done
sed -i 's,\+U,U,g' ../thai-console-data/keymaps/experimental/*.map
gzip ../thai-console-data/keymaps/*.map
../thai-console-data/keymaps/experimental/*.map
- install -m644 ../thai-console-data/keymaps/*.map.gz
../thai-console-data/keymaps/experimental/*uni*.map.gz
/usr/share/kbd/keymaps/i386/qwerty
+ install -m644 ../thai-console-data/keymaps/*.map.gz
../thai-console-data/keymaps/experimental/*uni*.map.gz
/lib/kbd/keymaps/i386/qwerty
clean:
-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
