X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=7e0d9538645c3740a701fcb6d6d9bad5fb1087fa;hb=9b2edd524c22426f9e0f3a8a3e870709679ce5c8;hp=547ddadaccf2a138c83a52b85dd98cdb4124f20b;hpb=843c8466e5fd7f20c6bcc6d0fc46a874955692f7;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index 547ddad..7e0d953 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -27,6 +27,9 @@ case "$1" in
     ;;
 esac
 
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
 # import CN-functions
 . /usr/share/carnet-tools/functions.sh
 
@@ -69,6 +72,35 @@ echo "CN: Removed old symlinks in / and /boot."
 
 ################################################################################
 
+DIVERT_TO="grub grub-probe"
+
+echo -n "CN: Undiverting binaries if necessary:"
+for i in $DIVERT_TO; do
+    if [ -e /usr/sbin/$i.real ]; then
+            dpkg-divert --remove --rename --package 'kernel-2.6-cn' \
+                --divert /usr/sbin/$i.real /usr/sbin/$i >/dev/null
+        echo -n " $i"
+    fi
+done
+echo "."
+
+################################################################################
+
+# detect existing Grub2 installation
+
+GRUB2="no"
+if [ -e /boot/grub/grub.cfg ];
+    echo "CN: Detected GRUB2 installation, will try to use it."
+    GRUB2="yes"
+    if [ -e /boot/grub/menu.lst ]; then
+        echo "CN: Oops, GRUB1 (Legacy) installation detected. Will try to upgrade to GRUB2."
+    fi
+else
+    echo "CN: No GRUB2 detected, will continue with GRUB1 as default option."
+fi
+
+################################################################################
+
 # intro msg
 echo -n "CN: Configuring system (this will take a while):"
 
@@ -77,7 +109,7 @@ if [ ! -e /etc/kernel-img.conf ]; then
     touch /etc/kernel-img.conf
 fi
 
-# update postinst_hook for grub
+# update postinst_hook for grub/grub2
 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' \
@@ -86,7 +118,7 @@ else
     echo "postinst_hook = /usr/sbin/update-grub" >> /etc/kernel-img.conf
 fi
 
-# update postrm_hook for grub
+# update postrm_hook for grub/grub2
 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' \
@@ -107,48 +139,68 @@ fi
 echo -n " kernel-img.conf"
 
 # generate initial grub loaders
-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/* "$grub_dir"
-    # x86_64
-    elif [ -d /usr/lib/grub/x86_64-pc ]; then
-        cp -a /usr/lib/grub/x86_64-pc/* "$grub_dir"
+if [ "x$GRUB2" = "xno" ]; then
+    # Grub1 part
+    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/* "$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
+else
+    # Grub2 part
+    if [ ! -d /boot/grub ]; then
+        mkdir -p /boot/grub
+        if [ -d /usr/lib/grub/i386-pc ]; then
+            cp -a /usr/lib/grub/i386-pc/* /boot/grub
+        fi
     fi
 fi
 echo -n " grub1"
 
 # create/update grub configuration
-if [ -e "$menu_file" ]; then
-    # is there uncompatibile grub conf present?
-    if ! grep -q 'AUTOMAGIC KERNELS LIST' "$menu_file"; then
-        mv -f "$menu_file" "$menu_file.old"
+if [ "x$GRUB2" = "xno" ]; then
+    # Grub1 part
+    if [ -e "$menu_file" ]; then
+        # is there uncompatibile grub conf present?
+        if ! grep -q 'AUTOMAGIC KERNELS LIST' "$menu_file"; then
+            mv -f "$menu_file" "$menu_file.old"
+        fi
+    fi
+    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
     fi
-fi
-if [ ! -e "$menu_file" ]; then
-    yes | /usr/sbin/update-grub >/dev/null 2>&1 || true
 else
+    # Grub2 part
     /usr/sbin/update-grub >/dev/null 2>&1 || true
 fi
 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
-fi
-echo -n " grub3"
-
-# workaround execshield
-SHIELD=$(sysctl -e -n kernel.exec-shield)
-if [ ! -z "$SHIELD" ]; then
-    sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1
-    echo -n " execshield1"
 fi
 
 # remove obsolete devfs/compat links and restore normal udev behaviour
@@ -162,23 +214,36 @@ 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
+if [ "x$GRUB2" = "xno" ]; then
+    # Grub1 part
+    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
+    if [ ! -s "$device_map" ]; then
+        if [ -f "$device_map.old" ]; then
+            mv -f "$device_map.old" "$device_map"
+        fi
 
-:q!else
-    rm -f "$device_map.old"
+    else
+        rm -f "$device_map.old"
+    fi
+else
+    # Grub2 part
+    grub-mkdevicemap -n
 fi
-echo -n " grub4"
+echo -n " grub3"
+
+# import GRUB helper functions (again, updated device map)
+. /usr/share/kernel-2.6-cn/grub-functions.sh
 
 # get install device (0x80 BIOS device)
+# this will work for both Grub1 and Grub2
+if [ "x$GRUB2" = "xyes" ]; then
+    device_map=/boot/grub/device.map
+fi
 install_device=$(grep '^(hd0)' "$device_map" | \
     sed -e 's%[^[:space:]]*[[:space:]]*\([^[:space:]]*\)%\1%')
 if [ -z "$install_device" ]; then
@@ -202,57 +267,59 @@ if [ -h "$install_device" ]; then
             || true
     fi
 fi
-echo -n " grub5"
+echo -n " grub4"
 
 # install GRUB loader
+# this will work for both Grub1 and Grub2
 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 " grub6"
+echo -n " grub5"
 
 # fix possible wrong params in menu.lst
-cp_check_and_sed '^# groot=' \
-  "s;^# groot=.*;# groot=$grub_root_device;g" \
-      "$menu_file" || true
-cp_check_and_sed '^# kopt=' \
-  "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
-      "$menu_file" || true
-/usr/sbin/update-grub >/dev/null 2>&1 || true
-echo -n " grub7"
-
-# 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
+if [ "x$GRUB2" = "xno" ]; then
+    # Grub1 part
+    cp_check_and_sed '^# groot=' \
+      "s;^# groot=.*;# groot=$grub_root_device;g" \
+          "$menu_file" || true
     cp_check_and_sed '^# kopt=' \
       "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
           "$menu_file" || true
-
-    # 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 " grub8"
+/usr/sbin/update-grub >/dev/null 2>&1 || true
+echo -n " grub6"
 
-# restore execshield state
-if [ ! -z "$SHIELD" ]; then
-    sysctl -e -w "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
-    echo -n " execshield2"
+# fix possible wrong params in menu.lst
+if [ "x$GRUB2" = "xno" ]; then
+    # Grub1 part
+    # ... 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
+
+        # 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
 fi
+echo -n " grub7"
 
 # disable lilo
 if [ -e /etc/lilo.conf ]; then
@@ -310,69 +377,13 @@ fi
 
 # default kernel parameters
 rm -f /etc/sysctl.conf.$$
-cat > /etc/sysctl.conf.$$ <<EOF
-kernel.exec-shield=3
-kernel.maps_protect=1
-net.core.rmem_default=1048576
-net.core.wmem_default=1048576
-net.ipv4.conf.all.accept_redirects=0
-net.ipv4.conf.all.accept_source_route=0
-net.ipv4.conf.all.log_martians=1
-net.ipv4.conf.all.rp_filter=1
-net.ipv4.conf.all.secure_redirects=1
-net.ipv4.conf.all.send_redirects=0
-net.ipv4.icmp_echo_ignore_broadcasts=1
-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_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
-    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' \
+    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
-#
-# /etc/sysctl.conf - Configuration file for setting system variables
-# See sysctl.conf (5) for information.
-#
-EOF
-
-# merge old and new in one conf, primarily respecting old
-script='
-my %confhash = ();
-my ($key, $value);
-while (<>)
-{
-  chomp();
-  if (/^\s*(\S+)\s*=\s*(.+)\s*$/o)
-  {
-    my ($key, $value) = ($1, $2);
-    $key =~ s/\//./go;
-    $confhash{$key} = $value;
-  }
-}
-for (sort { $a cmp $b } keys %confhash)
-{
-  print $_, "=", $confhash{$_}, "\n";
-}
-'
-rm -f /etc/sysctl.conf-new
-perl -e "$script" < /etc/sysctl.conf.$$ > /etc/sysctl.conf-new
-cat /etc/sysctl.conf-head /etc/sysctl.conf-new > /etc/sysctl.conf.$$
-rm -f /etc/sysctl.conf-head /etc/sysctl.conf-new
-
 # finished with merging, move into sysctl.conf
 cp_mv /etc/sysctl.conf.$$ /etc/sysctl.conf
 echo -n " sysctl.conf"
@@ -389,10 +400,12 @@ echo -n "CN: Setting up PAM configurations:"
 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
-*               soft    core            0
-*		hard	nofile		4096
-*		soft	nofile		4096
+    cp-update kernel-2.6-cn /etc/security/limits.conf.$$ <<'EOF'
+*       soft    core        0
+*		hard	nofile		16384
+*		soft	nofile		16384
+@users  soft    nproc       100
+@users  hard    nproc       150
 EOF
     cp_mv /etc/security/limits.conf.$$ /etc/security/limits.conf
     echo -n " limits"
@@ -422,7 +435,7 @@ echo "."
 # 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
@@ -455,7 +468,7 @@ fi
 # 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