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

diff --git a/debian/postinst b/debian/postinst
index 7e0d953..c6acc8a 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 ];
+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
@@ -101,6 +101,17 @@ fi
 
 ################################################################################
 
+# check if we are under Xen DomU PV
+# (perhaps check /sys/hypervisor/uuid in the future)
+
+GRUB_MBR="yes"
+if [ \( -w /dev/xvda \) -o \( -w /dev/xvdb \) ]; then
+    echo "CN: Detected DomU instance, won't install Grub MBR."
+    GRUB_MBR="no"
+fi
+
+################################################################################
+
 # intro msg
 echo -n "CN: Configuring system (this will take a while):"
 
@@ -172,13 +183,14 @@ if [ "x$GRUB2" = "xno" ]; then
         fi
     fi
     if [ ! -e "$menu_file" ]; then
-        yes | /usr/sbin/update-grub >/dev/null 2>&1 || true
+        yes | update-grub >/dev/null 2>&1 || true
     else
-        /usr/sbin/update-grub >/dev/null 2>&1 || true
+        update-grub >/dev/null 2>&1 || true
     fi
 else
     # Grub2 part
-    /usr/sbin/update-grub >/dev/null 2>&1 || true
+    touch /boot/grub/grub.cfg
+    update-grub >/dev/null 2>&1 || true
 fi
 echo -n " grub2"
 
@@ -210,7 +222,7 @@ rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
 #    ln -s ../udev.rules /etc/udev/rules.d/udev.rules
 #fi
 udevadm control --reload_rules >/dev/null 2>&1 || true
-udevsettle || true
+udevadm settle || true
 echo -n " udev"
 
 # update device map if possible
@@ -219,7 +231,14 @@ if [ "x$GRUB2" = "xno" ]; then
     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
+    # 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 syshelp@carnet.hr immediately!"
+        exit 1
+    fi
+    grub --batch --no-floppy --device-map="$device_map" <<'EOF' >/dev/null 2>&1 || true
 quit
 EOF
     if [ ! -s "$device_map" ]; then
@@ -232,52 +251,56 @@ EOF
     fi
 else
     # Grub2 part
-    grub-mkdevicemap -n
+    grub-mkdevicemap --no-floppy >/dev/null 2>&1 || true
+    grub-install --no-floppy --grub-setup=/bin/true "$(grub-probe -t drive /boot/grub)" >/dev/null 2>&1 || true
 fi
 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
-    echo "."
-    echo "CN: FATAL ERROR while detecting boot disk!"
-    echo "CN: Do not reboot your server and report this to OTRS immediately!"
-    exit 1
-fi
+. /usr/share/kernel-cn/grub-functions.sh
 
-# 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"
+if [ "x$GRUB2" = "xno" ]; then
+    # Grub1 part
+    # 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 while detecting boot disk!"
+        echo "CN: Do not reboot your server and report this to syshelp@carnet.hr immediately!"
+        exit 1
     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
+    # 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
+else
+    # Grub2 part
+    install_device="(hd0)"
 fi
 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
+# install GRUB loader: this will work for both Grub1 and Grub2
+if [ "x$GRUB_MBR" = "xyes" ]; then
+    if ! grub-install --no-floppy "$install_device" >/dev/null 2>&1; then
+        echo "."
+        echo "CN: FATAL ERROR while running grub-install on $install_device!"
+        echo "CN: Do not reboot your server and report this to syshelp@carnet.hr immediately!"
+        exit 1
+    fi
+    echo -n " grub5"
 fi
-echo -n " grub5"
 
 # fix possible wrong params in menu.lst
 if [ "x$GRUB2" = "xno" ]; then
@@ -289,7 +312,7 @@ if [ "x$GRUB2" = "xno" ]; then
       "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
           "$menu_file" || true
 fi
-/usr/sbin/update-grub >/dev/null 2>&1 || true
+update-grub >/dev/null 2>&1 || true
 echo -n " grub6"
 
 # fix possible wrong params in menu.lst
@@ -321,6 +344,22 @@ if [ "x$GRUB2" = "xno" ]; then
 fi
 echo -n " grub7"
 
+# install to other boot sectors if needed (better safe than sorry)
+if [ "x$GRUB_MBR" = "xyes" ]; then
+    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"
+fi
+
 # disable lilo
 if [ -e /etc/lilo.conf ]; then
     mv -f /etc/lilo.conf /etc/lilo.conf.old
@@ -380,7 +419,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\.maps_protect' \
         /etc/sysctl.conf >> /etc/sysctl.conf.$$
 fi
 
@@ -388,7 +427,10 @@ fi
 cp_mv /etc/sysctl.conf.$$ /etc/sysctl.conf
 echo -n " sysctl.conf"
 
-# finished with basic kernel-2.6-cn stuff
+# reload sysctl ASAP
+service procps restart
+
+# finished with basic kernel-cn stuff
 echo "."
 
 ################################################################################
@@ -400,7 +442,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
@@ -432,72 +474,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.