# backup lilo.conf
if [ -e /etc/lilo.conf ]; then
- cp_backup_conffile /etc/lilo.conf
- echo -n " lilo.conf"
+ cp_backup_conffile /etc/lilo.conf
+ echo -n " lilo.conf"
fi
# backup old kernel params
if [ -e /etc/sysctl.conf ]; then
- cp_backup_conffile /etc/sysctl.conf
- echo -n " sysctl.conf"
+ cp_backup_conffile /etc/sysctl.conf
+ echo -n " sysctl.conf"
fi
# backup old kernel params
if [ -e /etc/kernel-img.conf ]; then
- cp_backup_conffile /etc/kernel-img.conf
- echo -n " kernel-img.conf"
+ cp_backup_conffile /etc/kernel-img.conf
+ echo -n " kernel-img.conf"
fi
# finished
# remove obsolete symlinks and kernels
rm -f /boot/vmlinuz /boot/vmlinuz.old /boot/vmlinuz.old2 \
- /boot/vmlinuz.plain /vmlinuz /vmlinuz.old /boot/vmlinuz.plain \
- /boot/vmlinuz.generic /boot/vmlinuz-generic /boot/vmlinuz-old
+ /boot/vmlinuz.plain /vmlinuz /vmlinuz.old /boot/vmlinuz.plain \
+ /boot/vmlinuz.generic /boot/vmlinuz-generic /boot/vmlinuz-old
echo "CN: Removed old symlinks in / and /boot."
################################################################################
# update postinst_hook for grub
if grep -q postinst_hook /etc/kernel-img.conf; then
cp_check_and_sed '^postinst_hook' \
- 's;^postinst_hook[[:blank:]]*=.*;postinst_hook = /usr/sbin/update-grub;g' \
- /etc/kernel-img.conf || true
+ 's;^postinst_hook[[:blank:]]*=.*;postinst_hook = /usr/sbin/update-grub;g' \
+ /etc/kernel-img.conf || true
else
echo "postinst_hook = /usr/sbin/update-grub" >> /etc/kernel-img.conf
fi
# update postrm_hook for grub
if grep -q postrm_hook /etc/kernel-img.conf; then
cp_check_and_sed '^postrm_hook' \
- 's;^postrm_hook[[:blank:]]*=.*;postrm_hook = /usr/sbin/update-grub;g' \
- /etc/kernel-img.conf || true
+ 's;^postrm_hook[[:blank:]]*=.*;postrm_hook = /usr/sbin/update-grub;g' \
+ /etc/kernel-img.conf || true
else
echo "postrm_hook = /usr/sbin/update-grub" >> /etc/kernel-img.conf
fi
# enable initrd
if grep -q do_initrd /etc/kernel-img.conf; then
cp_check_and_sed '^do_initrd' \
- 's/^do_initrd[[:blank:]]*=.*/do_initrd = yes/g' \
- /etc/kernel-img.conf || true
+ 's/^do_initrd[[:blank:]]*=.*/do_initrd = yes/g' \
+ /etc/kernel-img.conf || true
else
echo "do_initrd = yes" >> /etc/kernel-img.conf
fi
echo -n " kernel-img.conf"
# generate initial grub loaders
-if [ ! -d /boot/grub ]; then
- mkdir -p /boot/grub
+if [ ! -d "$grub_dir" ]; then
+ mkdir -p "$grub_dir"
+ # x86
if [ -d /usr/lib/grub/i386-pc ]; then
- cp -a /usr/lib/grub/i386-pc/* /boot/grub
+ cp -a /usr/lib/grub/i386-pc/* "$grub_dir"
+ # x86_64
+ elif [ -d /usr/lib/grub/x86_64-pc ]; then
+ cp -a /usr/lib/grub/x86_64-pc/* "$grub_dir"
fi
fi
echo -n " grub1"
# create/update grub configuration
-if [ -e /boot/grub/menu.lst ]; then
+if [ -e "$menu_file" ]; then
# is there uncompatibile grub conf present?
- if ! grep -q 'AUTOMAGIC KERNELS LIST' /boot/grub/menu.lst; then
- mv -f /boot/grub/menu.lst /boot/grub/menu.lst.old
+ if ! grep -q 'AUTOMAGIC KERNELS LIST' "$menu_file"; then
+ mv -f "$menu_file" "$menu_file.old"
fi
fi
-if [ ! -e /boot/grub/menu.lst ]; then
+if [ ! -e "$menu_file" ]; then
yes | /usr/sbin/update-grub >/dev/null 2>&1 || true
else
/usr/sbin/update-grub >/dev/null 2>&1 || true
echo -n " grub2"
# workaround grsec
-if [ -x /sbin/chpax ]; then
- if [ -x /usr/sbin/grub ]; then
- chpax -spmrx /usr/sbin/grub || true
+if uname -a | grep -q grsec; then
+ if [ -x /sbin/chpax ]; then
+ # grub
+ if [ -x /usr/sbin/grub.real ]; then
+ chpax -spmrx /usr/sbin/grub.real >/dev/null 2>&1 || true
+ elif [ -x /usr/sbin/grub ]; then
+ chpax -spmrx /usr/sbin/grub >/dev/null 2>&1 || true
+ fi
+
+ # grub-probe
+ if [ -x /usr/sbin/grub-probe.real ]; then
+ chpax -spmrx /usr/sbin/grub-probe.real >/dev/null 2>&1 || true
+ elif [ -x /usr/sbin/grub-probe ]; then
+ chpax -spmrx /usr/sbin/grub-probe >/dev/null 2>&1 || true
+ fi
+
+ echo -n " grsec"
fi
- if [ -x /usr/sbin/grub-probe ]; then
- chpax -spmrx /usr/sbin/grub-probe || true
+fi
+
+# remove obsolete devfs/compat links and restore normal udev behaviour
+rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
+ /etc/udev/rules.d/compat-full.rules
+#if [ ! -e /etc/udev/rules.d/udev.rules ]; then
+# ln -s ../udev.rules /etc/udev/rules.d/udev.rules
+#fi
+udevadm control --reload_rules >/dev/null 2>&1 || true
+udevsettle || true
+echo -n " udev"
+
+# update device map if possible
+if [ -f "$device_map" ]; then
+ mv -f "$device_map" "$device_map.old"
+fi
+grub --batch --no-floppy --device-map="$device_map" <<'EOF' >/dev/null 2>&1
+quit
+EOF
+if [ ! -s "$device_map" ]; then
+ if [ -f "$device_map.old" ]; then
+ mv -f "$device_map.old" "$device_map"
fi
+
+else
+ rm -f "$device_map.old"
fi
echo -n " grub3"
-# workaround execshield
-SHIELD=$(sysctl -e -n kernel.exec-shield)
-if [ ! -z "$SHIELD" ]; then
- sysctl -w -e kernel.exec-shield=0 >/dev/null 2>&1
-fi
+# import GRUB helper functions (again, updated device map)
+. /usr/share/kernel-2.6-cn/grub-functions.sh
-# install grub loader
-if ! grub-install --no-floppy '(hd0)' >/dev/null 2>&1; then
+# get install device (0x80 BIOS device)
+install_device=$(grep '^(hd0)' "$device_map" | \
+ sed -e 's%[^[:space:]]*[[:space:]]*\([^[:space:]]*\)%\1%')
+if [ -z "$install_device" ]; then
echo "."
- echo "CN: FATAL ERROR running grub-install!"
+ echo "CN: FATAL ERROR while detecting boot disk!"
echo "CN: Do not reboot your server and report this to OTRS immediately!"
exit 1
fi
+
+# oops, install device is a symlink...
+if [ -h "$install_device" ]; then
+ install_device_resolved=$(resolve_symlink "$install_device")
+ if [ -z "$install_device_resolved" ]; then
+ install_device_resolved="$install_device"
+ fi
+
+ # try to fix device map with symlink resolved device
+ if [ "x$install_device_resolved" != "x$install_device" ]; then
+ cp_check_and_sed '^\(hd0\)' \
+ "s;^(hd0).*;(hd0) $install_device_resolved;" "$device_map" \
+ || true
+ fi
+fi
echo -n " grub4"
+# install GRUB loader
+if ! grub-install --no-floppy "$install_device" >/dev/null 2>&1; then
+ echo "."
+ echo "CN: FATAL ERROR while running grub-install!"
+ echo "CN: Do not reboot your server and report this to OTRS immediately!"
+ exit 1
+fi
+echo -n " grub5"
+
# fix possible wrong params in menu.lst
cp_check_and_sed '^# groot=' \
"s;^# groot=.*;# groot=$grub_root_device;g" \
- /boot/grub/menu.lst || true
+ "$menu_file" || true
cp_check_and_sed '^# kopt=' \
"s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
- /boot/grub/menu.lst || true
+ "$menu_file" || true
/usr/sbin/update-grub >/dev/null 2>&1 || true
-echo -n " grub5"
+echo -n " grub6"
+
+# and final stage of devfs/udev brokeness fix
+if [ "x$install_device_resolved" != "x$install_device" ]; then
+ # get original (symlinked device)
+ root_device=$(find_device_nonresolved "/")
+ if [ -z "$root_device" ]; then
+ root_device=$(find_root_device)
+ fi
+
+ # fix (hd0) mapping
+ cp_check_and_sed '^\(hd0\)' \
+ "s;^(hd0).*;(hd0) $install_device;" "$device_map" \
+ || true
+
+ # fix global root= invocation
+ cp_check_and_sed '^# kopt=' \
+ "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
+ "$menu_file" || true
-# restore execshield state
-if [ ! -z "$SHIELD" ]; then
- sysctl -w -e "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
+ # fix root= invocation for individual kernel profiles
+ cp_check_and_sed '^kernel' \
+ "s;\(^kernel.*\)root=[^[:space:]]*\(.*\);\1root=$root_device\2;g" \
+ "$menu_file" || true
fi
+echo -n " grub7"
# disable lilo
if [ -e /etc/lilo.conf ]; then
mv -f /etc/lilo.conf /etc/lilo.conf.old
+ echo -n " lilo"
fi
-echo -n " lilo"
# mdadm
if [ -x /usr/share/mdadm/mkconf ]; then
echo -n " mdadm"
fi
-# update initramfs accordingly
+# update initramfs accordingly (because of mdadm and udev)
update-initramfs -u -k all >/dev/null 2>&1 || true
echo -n " initramfs"
# remove group 99
if getent group proc >/dev/null 2>&1; then
groupdel proc >/dev/null 2>&1
+ echo -n " proc"
fi
-echo -n " proc"
# remove oidentd from oident group
if getent group oident >/dev/null 2>&1; then
# default kernel parameters
rm -f /etc/sysctl.conf.$$
-cat > /etc/sysctl.conf.$$ <<EOF
-kernel.exec-shield=3
+cat > /etc/sysctl.conf.$$ <<'EOF'
kernel.maps_protect=1
+kernel.exec-shield=0
net.core.rmem_default=1048576
net.core.wmem_default=1048576
net.ipv4.conf.all.accept_redirects=0
net.ipv4.icmp_ignore_bogus_error_responses=1
net.ipv4.ip_forward=0
net.ipv4.ip_local_port_range=10000 65000
-net.ipv4.tcp_congestion_control=cubic
net.ipv4.tcp_ecn=0
-net.ipv4.tcp_max_syn_backlog=8192
+net.ipv4.tcp_max_syn_backlog=1024
net.ipv4.tcp_retries1=2
net.ipv4.tcp_rfc1337=1
net.ipv4.tcp_syncookies=1
vm.mmap_min_addr=65536
EOF
-# old kernel params
+# old kernel params (skipping some of the obsolete or overrided entries)
if [ -e /etc/sysctl.conf ]; then
- #cat /etc/sysctl.conf >> /etc/sysctl.conf.$$
- #ignore some of 2.4 stuff
- 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' \
- /etc/sysctl.conf >> /etc/sysctl.conf.$$
+ 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' \
+ /etc/sysctl.conf >> /etc/sysctl.conf.$$
fi
# add sysctl.conf Debian headers
rm -f /etc/sysctl.conf-head
-cat > /etc/sysctl.conf-head <<EOF
+cat > /etc/sysctl.conf-head <<'EOF'
#
# /etc/sysctl.conf - Configuration file for setting system variables
# See sysctl.conf (5) for information.
# update pam_limits accordingly
if [ -e /etc/security/limits.conf ]; then
- rm -f /etc/security/limits.conf.$$
- cp /etc/security/limits.conf /etc/security/limits.conf.$$
- cp-update kernel-2.6-cn /etc/security/limits.conf.$$ <<EOF
+ rm -f /etc/security/limits.conf.$$
+ cp /etc/security/limits.conf /etc/security/limits.conf.$$
+ cp-update kernel-2.6-cn /etc/security/limits.conf.$$ <<'EOF'
* soft core 0
* hard nofile 4096
* soft nofile 4096
EOF
- cp_mv /etc/security/limits.conf.$$ /etc/security/limits.conf
- echo -n " limits"
+ cp_mv /etc/security/limits.conf.$$ /etc/security/limits.conf
+ echo -n " limits"
fi
# check pam.d/login
if [ -e /etc/pam.d/login ]; then
- cp_check_and_sed '^#.*session.+required.+pam_limits.so' \
- 's/^#.*session.+required.+pam_limits.so/session required pam_limits.so/' \
- /etc/pam.d/login || true
- echo -n " login"
+ cp_check_and_sed '^#.*session.+required.+pam_limits.so' \
+ 's/^#.*session.+required.+pam_limits.so/session required pam_limits.so/' \
+ /etc/pam.d/login || true
+ echo -n " login"
fi
# check pam.d/ssh
if [ -e /etc/pam.d/ssh ]; then
- cp_check_and_sed '^#.*session.+required.+pam_limits.so' \
- 's/^#.*session.+required.+pam_limits.so/session required pam_limits.so/' \
- /etc/pam.d/ssh || true
- echo -n " ssh"
+ cp_check_and_sed '^#.*session.+required.+pam_limits.so' \
+ 's/^#.*session.+required.+pam_limits.so/session required pam_limits.so/' \
+ /etc/pam.d/ssh || true
+ echo -n " ssh"
fi
# finished with PAM
# fix old kernel-2.4-cn postrm
if [ -e /var/lib/dpkg/info/kernel-2.4-cn.postrm ]; then
echo "CN: Fixed old kernel-2.4-cn postrm."
- cat > /var/lib/dpkg/info/kernel-2.4-cn.postrm.$$ <<EOF
+ cat > /var/lib/dpkg/info/kernel-2.4-cn.postrm.$$ <<'EOF'
#!/bin/sh
set -e
# fix old kernel-cn postrm
if [ -e /var/lib/dpkg/info/kernel-cn.postrm ]; then
echo "CN: Fixed old kernel-cn postrm."
- cat > /var/lib/dpkg/info/kernel-cn.postrm.$$ <<EOF
+ cat > /var/lib/dpkg/info/kernel-cn.postrm.$$ <<'EOF'
#!/bin/sh
set -e
projects / kernel-cn.git / blobdiff