[Glibc-bsd-commits] r2733 - trunk/freebsd-utils/debian

[Aurelien Jarno]

Author: aurel32
Date: 2009-08-22 12:53:05 +0000 (Sat, 22 Aug 2009)
New Revision: 2733

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-utils.init
Log:
  * debian/freebsd-utils.init: avoid printing error messages during
    boot.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2009-08-22 11:32:39 UTC (rev 2732)
+++ trunk/freebsd-utils/debian/changelog	2009-08-22 12:53:05 UTC (rev 2733)
@@ -2,6 +2,8 @@
 
   * debian/rules: adjust start priority of freebsd-utils.init and 
     kldutils.init.
+  * debian/freebsd-utils.init: avoid printing error messages during
+    boot.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Aug 2009 13:32:17 +0200
 

Modified: trunk/freebsd-utils/debian/freebsd-utils.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init	2009-08-22 11:32:39 UTC (rev 2732)
+++ trunk/freebsd-utils/debian/freebsd-utils.init	2009-08-22 12:53:05 UTC (rev 2733)
@@ -29,7 +29,7 @@
 
     # only do this during boot, to avoid messing up ttys
     if [ "$RUNLEVEL" = "S" ] ; then
-      chown root:root /dev/*
+      chown root:root /dev/* 2> /dev/null
     fi
     
     for i in /dev/dsp{,[0-9]} /dev/mixer{,[0-9]} /dev/audio{,ctl,[0-9]} ; do
@@ -84,18 +84,18 @@
     fi
     
     echo "done."
-    
-    if test -f /etc/mtab && ! test -h /etc/mtab ; then
-      echo "Warning: /etc/mtab is a regular file, replacing with symlink."
+   
+    if [ $(readlink /etc/mtab) != "/proc/mounts" ] ; then
+      echo "Warning: replacing /etc/mtab by a symlink to /proc/mounts."
       rm -f /etc/mtab
+      ln -f /proc/mounts /etc/mtab
     fi
-    ln -sf /proc/mounts /etc/mtab
 
     # Mount /dev/fd, /proc and /sys
-    if ! mount | grep -q "on /proc (linprocfs" ; then
+    if ! test -f /proc/cmdline ; then
       mount -t linprocfs proc /proc
     fi
-    if ! mount | grep -q "on /sys (linsysfs" ; then
+    if ! test -d /sys/devices ; then
       # Should be done during the installation
       if [ ! -d /sys ] ; then
         mkdir /sys