diff options
| -rw-r--r-- | install/keymap | 6 | ||||
| -rw-r--r-- | mkinitcpio | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/install/keymap b/install/keymap index 767feff..800ab47 100644 --- a/install/keymap +++ b/install/keymap @@ -19,11 +19,11 @@ install () fi . ${KEYMAP_FILE} add_file ${KEYMAP_FILE} /keymap - [ "$CONSOLEFONT" != "" ] && add_file /usr/share/kbd/consolefonts/$(grep "CONSOLEFONT=" /etc/rc.conf | awk -FCONSOLEFONT= '{print $2}' | sed -e "s@[\"']*@@g")*.map.gz")* - [ "$CONSOLEMAP" != "" ] && add_file /usr/share/kbd/unimaps/$(grep "CONSOLEMAP=" /etc/rc.conf | awk -FCONSOLEMAP= '{print $2}' | sed -e "s@[\"']*@@g")*.map.gz")* + [ "$CONSOLEFONT" != "" ] && add_file /usr/share/kbd/consolefonts/$(grep "CONSOLEFONT=" /etc/rc.conf | awk -FCONSOLEFONT= '{print $2}' | sed -e "s@[\"']*@@g")* + [ "$CONSOLEMAP" != "" ] && add_file /usr/share/kbd/unimaps/$(grep "CONSOLEMAP=" /etc/rc.conf | awk -FCONSOLEMAP= '{print $2}' | sed -e "s@[\"']*@@g")* if [ "$KEYMAP" != "" ]; then for i in $(find /usr/share/kbd/ -name "$(grep "KEYMAP=" /etc/rc.conf |\ - awk -FKEYMAP= '{print $2}' | awk -F- '{print $1}' | sed -e "s@[\"']*@@g")*.map.gz" )*.map.gz"); do + awk -FKEYMAP= '{print $2}' | awk -F- '{print $1}' | sed -e "s@[\"']*@@g")*.map.gz"); do add_file $i done for i in $(echo /usr/share/kbd/keymaps/include/*); do @@ -144,7 +144,6 @@ if [ "${HAS_MODULES}" == "y" ]; then add_file /tmp${MODULEDIR}/modules.dep ${MODULEDIR}/modules.dep add_file /tmp${MODULEDIR}/modules.alias ${MODULEDIR}/modules.alias add_file /tmp${MODULEDIR}/modules.symbols ${MODULEDIR}/modules.symbols - rm -rf /tmp${MODULEDIR}/ fi if [ "x$GENIMG" != "x" ]; then @@ -162,4 +161,5 @@ else echo ":: Dry run complete, use -g IMAGE to generate a real image" fi [ -e "${MODULE_FILE}" ] && rm "${MODULE_FILE}" +[ -e "/tmp${MODULEDIR}/" ] && rm -rf /tmp${MODULEDIR}/ #vim:set ft=sh ts=4 sw=4 noet: |