# detect existing Grub2 installation
GRUB2="no"
-if [ -e /boot/grub/grub.cfg ]; then
+if [ \( -e /boot/grub/grub.cfg \) -o \( -e /boot/grub/core.img \) ]; then
echo "CN: Detected GRUB2 installation, will try to use it."
GRUB2="yes"
if [ -e /boot/grub/menu.lst ]; then
fi
else
# Grub2 part
+ touch /boot/grub/grub.cfg
update-grub >/dev/null 2>&1 || true
fi
echo -n " grub2"
fi
else
# Grub2 part
- grub-mkdevicemap -n
+ grub-mkdevicemap --no-floppy
+ grub-install --no-floppy --grub-setup=/bin/true "$(grub-probe /boot/grub)" >/dev/null 2>&1
fi
echo -n " grub3"
fi
else
# Grub2 part
- install_device='(hd0)'
+ install_device="$(grub-probe /boot/grub)"
fi
echo -n " grub4"
# old kernel params (skipping some of the obsolete or overrided entries)
if [ -e /etc/sysctl.conf ]; then
- egrep -v 'net\.core\.(r|w)mem_max|net\.ipv4\.tcp_(r|w)mem|vm\.bdflush|net\.ipv4\.ip_local_port_range|kernel\.rtsig-max|net\.ipv4\.tcp_syncookies|kernel\.exec-shield|net\.ipv4\.tcp_max_syn_backlog|net\.ipv4\.tcp_congestion_control|kernel\.exec-shield' \
+ egrep -v 'net\.core\.(r|w)mem_max|net\.ipv4\.tcp_(r|w)mem|vm\.bdflush|net\.ipv4\.ip_local_port_range|kernel\.rtsig-max|net\.ipv4\.tcp_syncookies|kernel\.exec-shield|net\.ipv4\.tcp_max_syn_backlog|net\.ipv4\.tcp_congestion_control|kernel\.exec-shield|kernel\.maps_protect' \
/etc/sysctl.conf >> /etc/sysctl.conf.$$
fi
cp_mv /etc/sysctl.conf.$$ /etc/sysctl.conf
echo -n " sysctl.conf"
+# reload sysctl ASAP
+if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d procps restart >/dev/null 2>&1 || true
+else
+ /etc/init.d/procps restart >/dev/null 2>&1 || true
+fi
+
# finished with basic kernel-2.6-cn stuff
echo "."