From 3ae9cfd0860afe734c6d96e33d9d4ec320497c9f Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Wed, 24 Feb 2010 12:18:58 +0100 Subject: [PATCH] * #10200: debian/postinst: here-doc quoting * #10199: Lintian greske/upozorenja --- debian/changelog | 4 +++- debian/control | 4 ++-- debian/postinst | 12 ++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0bc41b..7137078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ kernel-2.6-cn (3:2.6.26-6) stable; urgency=low * #10170: ukloniti konflikte s prethodnim kernelom * #10171: detektirati Layer7 prije upgrade-a * #10172: NEWS.CARNet za ExecShield, Layer7 + * #10200: debian/postinst: here-doc quoting + * #10199: Lintian greske/upozorenja - -- Dinko Korunic Mon, 22 Feb 2010 16:23:35 +0100 + -- Dinko Korunic Wed, 24 Feb 2010 12:12:08 +0100 kernel-2.6-cn (3:2.6.26-5) stable; urgency=low diff --git a/debian/control b/debian/control index e8690f6..33bebed 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.7.2 Package: kernel-2.6-cn Architecture: all -Section: base -Depends: grub (>= 0.97-47lenny2), procps (>= 1:3.2.7-11), udev (>= 0.125-7+lenny1), perl-base, carnet-tools-cn (>= 2.8.2), module-init-tools (>= 3.4-1), mount (>= 2.13.1.1-1), e2fsprogs (>= 1.41.3-1), microcode.ctl (>= 1.17-9), irqbalance (>= 0.55-2.4lenny1), mdadm (>= 2.6.7.2-1), firmware-bnx2 (>= 0.14+lenny1), linux-image-686-bigmem | linux-image-amd64 +Section: admin +Depends: grub (>= 0.97-47lenny2), procps (>= 1:3.2.7-11), udev (>= 0.125-7+lenny1), carnet-tools-cn (>= 2.8.2), module-init-tools (>= 3.4-1), mount (>= 2.13.1.1-1), e2fsprogs (>= 1.41.3-1), microcode.ctl (>= 1.17-9), irqbalance (>= 0.55-2.4lenny1), mdadm (>= 2.6.7.2-1), firmware-bnx2 (>= 0.14+lenny1), linux-image-686-bigmem | linux-image-amd64 Conflicts: iplogger, kernel-cn, kernel-2.4-cn (<< 2.4.33-2) Replaces: kernel-cn, kernel-2.4-cn Provides: kernel-cn diff --git a/debian/postinst b/debian/postinst index 86621d5..05e3d63 100755 --- a/debian/postinst +++ b/debian/postinst @@ -168,7 +168,7 @@ echo -n " udev" if [ -f "$device_map" ]; then mv -f "$device_map" "$device_map.old" fi -grub --batch --no-floppy --device-map="$device_map" </dev/null 2>&1 +grub --batch --no-floppy --device-map="$device_map" <<'EOF' >/dev/null 2>&1 quit EOF if [ ! -s "$device_map" ]; then @@ -310,7 +310,7 @@ fi # default kernel parameters rm -f /etc/sysctl.conf.$$ -cat > /etc/sysctl.conf.$$ < /etc/sysctl.conf.$$ <<'EOF' kernel.maps_protect=1 net.core.rmem_default=1048576 net.core.wmem_default=1048576 @@ -340,7 +340,7 @@ fi # add sysctl.conf Debian headers rm -f /etc/sysctl.conf-head -cat > /etc/sysctl.conf-head < /etc/sysctl.conf-head <<'EOF' # # /etc/sysctl.conf - Configuration file for setting system variables # See sysctl.conf (5) for information. @@ -387,7 +387,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.$$ < /var/lib/dpkg/info/kernel-2.4-cn.postrm.$$ < /var/lib/dpkg/info/kernel-2.4-cn.postrm.$$ <<'EOF' #!/bin/sh set -e @@ -453,7 +453,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.$$ < /var/lib/dpkg/info/kernel-cn.postrm.$$ <<'EOF' #!/bin/sh set -e -- 1.7.10.4