[Glibc-bsd-commits] r4308 - trunk/kfreebsd-9/debian

[Robert Millan]

Author: rmh
Date: 2012-06-15 20:15:26 +0000 (Fri, 15 Jun 2012)
New Revision: 4308

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in
Log:
Remove /boot symlink kludge.  (Closes: #672255)

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2012-06-15 20:02:46 UTC (rev 4307)
+++ trunk/kfreebsd-9/debian/changelog	2012-06-15 20:15:26 UTC (rev 4308)
@@ -1,3 +1,9 @@
+kfreebsd-9 (9.0-5) UNRELEASED; urgency=low
+
+  * Remove /boot symlink kludge.  (Closes: #672255)
+
+ -- Robert Millan <rmh at debian.org>  Fri, 15 Jun 2012 22:14:47 +0200
+
 kfreebsd-9 (9.0-4) unstable; urgency=high
 
   [ Steven Chamberlain ]

Modified: trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in	2012-06-15 20:02:46 UTC (rev 4307)
+++ trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in	2012-06-15 20:15:26 UTC (rev 4308)
@@ -24,37 +24,6 @@
 
 case "$1" in
     configure)
-        # Don't do symlinks if explicitely disabled
-        if [ -z "$(sed -e '/^\s*do_symlinks\s*=\s*\(no\|false\|0\)\s*$/!d' $KERNEL_IMG_CONF 2>/dev/null)" ] ; then
-            for i in kernel.gz acpi.ko ; do
-                if test -e /boot/kernel/$i && ! test -L /boot/kernel/$i ; then
-                    echo "What happen!! /boot/kernel/$i exists but is not a symlink."
-                    exit 1
-                fi
-            done
-
-	    mkdir -p /boot/kernel
-
-            if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd-$RELEASE.gz" ] ; then
-                rm -f /boot/kernel/kernel.old.gz
-                if [ -L /boot/kernel/kernel.gz ] ; then
-                    mv /boot/kernel/kernel.gz /boot/kernel/kernel.old.gz
-                fi
-                ln -s /boot/kfreebsd-$RELEASE.gz /boot/kernel/kernel.gz
-            fi
-
-            # on i386 acpi MUST be within kfreebsd-loader reach
-            if [ "${RELEASE%%-[456]86}" != "${RELEASE}" ] ; then
-                if [ "$(readlink -f /boot/kernel/acpi.ko)" != "/lib/modules/$RELEASE/acpi.ko" ] ; then
-                    rm -f /boot/kernel/acpi.ko.old
-                    if [ -L /boot/kernel/acpi.ko ] ; then
-                        mv /boot/kernel/acpi.ko /boot/kernel/acpi.ko.old
-                    fi
-                    ln -s /lib/modules/$RELEASE/acpi.ko /boot/kernel/acpi.ko
-                fi
-            fi
-        fi
-
         # Sanitize and quote maintainer script parameters
         for p in "$@"; do
             q="$(echo "$p" | sed -e "s/'/'\\''/g")"