X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=29e424e47c06b663ec1059851fd8e72c8521668b;hb=8e63ec3203b5575cd88940fea9ee242d7725b531;hp=63cf3b23ec478a5380b76109b919d401cf349677;hpb=f4b1a6d842465b806c79791ace97283b13e6976b;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index 63cf3b2..29e424e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for kernel-2.6-cn
+# postinst script for kernel-cn
 #
 # see: dh_installdeb(1)
 
@@ -34,7 +34,7 @@ esac
 . /usr/share/carnet-tools/functions.sh
 
 # import GRUB helper functions
-. /usr/share/kernel-2.6-cn/grub-functions.sh
+. /usr/share/kernel-cn/grub-functions.sh
 
 ################################################################################
 
@@ -89,7 +89,7 @@ echo "."
 # 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 \) -o \( -e /usr/lib/grub/i386-pc/ext2.mod \) ]; then
     echo "CN: Detected GRUB2 installation, will try to use it."
     GRUB2="yes"
     if [ -e /boot/grub/menu.lst ]; then
@@ -178,6 +178,7 @@ if [ "x$GRUB2" = "xno" ]; then
     fi
 else
     # Grub2 part
+    touch /boot/grub/grub.cfg
     update-grub >/dev/null 2>&1 || true
 fi
 echo -n " grub2"
@@ -219,6 +220,13 @@ if [ "x$GRUB2" = "xno" ]; then
     if [ -f "$device_map" ]; then
         mv -f "$device_map" "$device_map.old"
     fi
+    # possible situation when upgrading from Grub1 to Grub2
+    if [ ! -x /usr/sbin/grub ]; then
+        echo "."
+        echo "CN: FATAL ERROR while trying to execute GRUB1!"
+        echo "CN: Do not reboot your server and report this to OTRS immediately!"
+        exit 1
+    fi
     grub --batch --no-floppy --device-map="$device_map" <<'EOF' >/dev/null 2>&1
 quit
 EOF
@@ -232,12 +240,13 @@ EOF
     fi
 else
     # Grub2 part
-    grub-mkdevicemap -n
+    grub-mkdevicemap --no-floppy
+    grub-install --no-floppy --grub-setup=/bin/true "$(grub-probe -t drive /boot/grub)" >/dev/null 2>&1
 fi
 echo -n " grub3"
 
 # import GRUB helper functions (again, updated device map)
-. /usr/share/kernel-2.6-cn/grub-functions.sh
+. /usr/share/kernel-cn/grub-functions.sh
 
 if [ "x$GRUB2" = "xno" ]; then
     # Grub1 part
@@ -267,7 +276,7 @@ if [ "x$GRUB2" = "xno" ]; then
     fi
 else
     # Grub2 part
-    install_device='(hd0)'
+    install_device="(hd0)"
 fi
 echo -n " grub4"
 
@@ -323,6 +332,20 @@ if [ "x$GRUB2" = "xno" ]; then
 fi
 echo -n " grub7"
 
+# install to other boot sectors if needed (better safe than sorry)
+if [ "x$GRUB2" = "xyes" ]; then
+    # Grub2 part
+    db_get grub-pc/install_devices
+    for i in `echo $RET | sed -e 's/,/ /g'`; do
+        real_device="$(readlink -f "$i")"
+        if [ -e "$real_device" ]; then
+            grub-install --force --no-floppy $real_device \
+                >/dev/null 2>&1 || true
+        fi
+    done
+fi
+echo -n " grub8"
+
 # disable lilo
 if [ -e /etc/lilo.conf ]; then
     mv -f /etc/lilo.conf /etc/lilo.conf.old
@@ -382,7 +405,7 @@ rm -f /etc/sysctl.conf.$$
 
 # 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
 
@@ -390,7 +413,14 @@ fi
 cp_mv /etc/sysctl.conf.$$ /etc/sysctl.conf
 echo -n " sysctl.conf"
 
-# finished with basic kernel-2.6-cn stuff
+# 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-cn stuff
 echo "."
 
 ################################################################################
@@ -402,7 +432,7 @@ 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'
+    cp-update kernel-cn /etc/security/limits.conf.$$ <<'EOF'
 *       soft    core        0
 *		hard	nofile		16384
 *		soft	nofile		16384
@@ -434,72 +464,6 @@ 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'
-#!/bin/sh
-
-set -e
-
-# be sure, be safe
-if [ "$1" != "remove" ]; then
-  exit 0
-fi
-
-# import CN-functions
-. /usr/share/carnet-tools/functions.sh
-
-# remove us from limits.conf
-cp-update -r kernel-2.4-cn /etc/security/limits.conf
-
-# remove us from modules
-cp-update -r kernel-2.4-cn /etc/modules
-EOF
-    if ! cmp -s /var/lib/dpkg/info/kernel-2.4-cn.postrm \
-        /var/lib/dpkg/info/kernel-2.4-cn.postrm.$$; then
-        mv /var/lib/dpkg/info/kernel-2.4-cn.postrm.$$ \
-            /var/lib/dpkg/info/kernel-2.4-cn.postrm
-        chmod +x /var/lib/dpkg/info/kernel-2.4-cn.postrm
-    fi
-    rm -f /var/lib/dpkg/info/kernel-2.4-cn.postrm.$$
-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'
-#!/bin/sh
-
-set -e
-
-# be sure, be safe
-if [ "$1" != "remove" ]; then
-  exit 0
-fi
-
-# import CN-functions
-. /usr/share/carnet-tools/functions.sh
-
-# remove us from limits.conf
-cp-update -r kernel-cn /etc/security/limits.conf
-
-# remove us from modules
-cp-update -r kernel-cn /etc/modules
-EOF
-    if ! cmp -s /var/lib/dpkg/info/kernel-cn.postrm \
-        /var/lib/dpkg/info/kernel-cn.postrm.$$; then
-        mv /var/lib/dpkg/info/kernel-cn.postrm.$$ \
-            /var/lib/dpkg/info/kernel-cn.postrm
-        chmod +x /var/lib/dpkg/info/kernel-cn.postrm
-    fi
-    rm -f /var/lib/dpkg/info/kernel-cn.postrm.$$
-fi
-
-################################################################################
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.