From: Dinko Korunic <kreator@carnet.hr>
Date: Mon, 25 May 2009 18:15:32 +0000 (+0200)
Subject: - poljepsanje koda, bolji ispis detalja tijekom postinsta
X-Git-Tag: debian/2.6.26-4~19
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=fcde92dd00b7faa947dcb7b7d1918ecf53f1d5af;p=kernel-cn.git

- poljepsanje koda, bolji ispis detalja tijekom postinsta
- dodatak koda za workaround oko udev + devfs brokenessa
---

diff --git a/debian/postinst b/debian/postinst
index e22b539..462ad6f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -40,20 +40,20 @@ echo -n "CN: Backed up to /var/backups:"
 
 # 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
@@ -63,8 +63,8 @@ echo "."
 
 # 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."
 
 ################################################################################
@@ -80,8 +80,8 @@ fi
 # 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
@@ -89,8 +89,8 @@ 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
@@ -98,8 +98,8 @@ 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
@@ -144,8 +144,15 @@ echo -n " grub3"
 SHIELD=$(sysctl -e -n kernel.exec-shield)
 if [ ! -z "$SHIELD" ]; then
     sysctl -w -e kernel.exec-shield=0 >/dev/null 2>&1
+    echo -n " execshield1"
 fi
 
+# remove obsolete devfs compat links
+rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
+    /etc/udev/rules.d/compat-full.rules
+udevcontrol reload_rules >/dev/null 2>&1 || true
+echo -n " udev"
+
 # install grub loader
 if ! grub-install --no-floppy '(hd0)' >/dev/null 2>&1; then
     echo "."
@@ -168,13 +175,14 @@ echo -n " grub5"
 # restore execshield state
 if [ ! -z "$SHIELD" ]; then
     sysctl -w -e "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
+    echo -n " execshield2"
 fi
 
 # 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
@@ -206,8 +214,8 @@ echo -n "CN: Modifying the neccessary system files:"
 # 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
@@ -252,10 +260,8 @@ EOF
 
 # old kernel params
 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' \
+        /etc/sysctl.conf >> /etc/sysctl.conf.$$
 fi
 
 # add sysctl.conf Debian headers
@@ -305,31 +311,31 @@ echo -n "CN: Setting up PAM configurations:"
 
 # 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