Drop commented out code, cruft of the past

cleanup-cruft
Fabio Erculiani 12 years ago
parent f05e8896f6
commit 4288a38895

@ -611,14 +611,7 @@ chooseKeymap() {
then then
good_msg "Loading the ''${keymap}'' keymap" good_msg "Loading the ''${keymap}'' keymap"
loadkmap < /lib/keymaps/${keymap}.map loadkmap < /lib/keymaps/${keymap}.map
# xkeymap=${keymap}
# echo ${keymap} | egrep -e "[0-9]+" >/dev/null 2>&1
# if [ $? -eq 0 ]
# then
# xkeymap=`tail -n 8 /lib/keymaps/keymapList | grep ${keymap} | sed -r "s/.*\s+${keymap}\s+([a-z-]+).*/\1/g" | egrep -v 1`
# fi
mkdir -p /etc/sysconfig mkdir -p /etc/sysconfig
# echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard
echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard
splash set_msg "Set keymap to ${keymap}" splash set_msg "Set keymap to ${keymap}"
elif [ -z "${keymap}" ] elif [ -z "${keymap}" ]

@ -152,7 +152,6 @@ do
CONSOLE=*|console=*) CONSOLE=*|console=*)
CONSOLE=${x#*=} CONSOLE=${x#*=}
CONSOLE=$(basename ${CONSOLE}) CONSOLE=$(basename ${CONSOLE})
# exec >${CONSOLE} <${CONSOLE} 2>&1
;; ;;
# /dev/md # /dev/md
lvmraid=*) lvmraid=*)
@ -662,8 +661,6 @@ do
done done
# End determine root device # End determine root device
#verbose_kmsg
# If CD root is set determine the looptype to boot # If CD root is set determine the looptype to boot
if [ "${CDROOT}" = '1' ] if [ "${CDROOT}" = '1' ]
then then
@ -847,13 +844,6 @@ then
fi fi
#UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
#if [ "${UML}" = 'UML' ]
#then
# # UML Fixes
# good_msg 'Updating for uml system'
#fi
# Let Init scripts know that we booted from CD # Let Init scripts know that we booted from CD
export CDBOOT export CDBOOT
CDBOOT=1 CDBOOT=1

@ -420,17 +420,7 @@ compile_fuse() {
gen_die 'Configuring fuse failed!' gen_die 'Configuring fuse failed!'
print_info 1 'fuse: >> Compiling...' print_info 1 'fuse: >> Compiling...'
MAKE=${UTILS_MAKE} compile_generic "" "" MAKE=${UTILS_MAKE} compile_generic "" ""
# Since we're linking statically against libfuse, we don't need to cache the .so
# print_info 1 'libfuse: >> Copying to cache...'
# [ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] ||
# gen_die 'libfuse.so does not exist!'
# cd "${TEMP}/${FUSE_DIR}/lib/.libs"
# tar -cjf "${FUSE_BINCACHE}" libfuse*so* ||
# gen_die 'Could not create fuse bincache!'
cd "${TEMP}" cd "${TEMP}"
# rm -rf "${FUSE_DIR}" > /dev/null
fi fi
} }

@ -185,40 +185,6 @@ append_blkid(){
rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null
} }
#append_fuse() {
# if [ -d "${TEMP}/initramfs-fuse-temp" ]
# then
# rm -r "${TEMP}/initramfs-fuse-temp"
# fi
# cd ${TEMP}
# mkdir -p "${TEMP}/initramfs-fuse-temp/lib/"
# tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xjf "${FUSE_BINCACHE}"
# cd "${TEMP}/initramfs-fuse-temp/"
# find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
# || gen_die "compressing fuse cpio"
# rm -rf "${TEMP}/initramfs-fuse-temp" > /dev/null
#}
#append_suspend(){
# if [ -d "${TEMP}/initramfs-suspend-temp" ];
# then
# rm -r "${TEMP}/initramfs-suspend-temp/"
# fi
# print_info 1 'SUSPEND: Adding support (compiling binaries)...'
# compile_suspend
# mkdir -p "${TEMP}/initramfs-suspend-temp/"
# /bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" ||
# gen_die "Could not extract suspend binary cache!"
# mkdir -p "${TEMP}/initramfs-suspend-temp/etc"
# cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" ||
# gen_die 'Could not copy /etc/suspend.conf'
# cd "${TEMP}/initramfs-suspend-temp/"
# log_future_cpio_content
# find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
# || gen_die "compressing suspend cpio"
# rm -r "${TEMP}/initramfs-suspend-temp/"
#}
append_multipath(){ append_multipath(){
if [ -d "${TEMP}/initramfs-multipath-temp" ] if [ -d "${TEMP}/initramfs-multipath-temp" ]
then then

Loading…
Cancel
Save