Package: initscripts
Version: 2.88dsf-18
Severity: minor
Tags: patch
/proc/mounts is symlink to /proc/self/mounts. So there is no need to
replace /etc/mtab if it is symlink to /proc/self/mounts.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-rc7 (SMP w/4 CPU cores)
Locale: LANG=ja_JP.eucJP, LC_CTYPE=ja_JP.eucJP (charmap=EUC-JP)
Shell: /bin/sh linked to /bin/dash
Versions of packages initscripts depends on:
ii coreutils 8.13-3
ii debianutils 4.1
ii libc6 2.13-24
ii lsb-base 3.2-28
ii mount 2.20.1-1
ii sysv-rc 2.88dsf-18
ii sysvinit-utils 2.88dsf-18
Versions of packages initscripts recommends:
pn e2fsprogs 1.42-1
pn psmisc <none>
initscripts suggests no packages.
-- no debconf information
diff -uNrp sysvinit-2.88dsf.orig/debian/src/initscripts/lib/init/mount-functions.sh sysvinit-2.88dsf/debian/src/initscripts/lib/init/mount-functions.sh
--- sysvinit-2.88dsf.orig/debian/src/initscripts/lib/init/mount-functions.sh 2011-12-13 20:16:15.000000000 +0000
+++ sysvinit-2.88dsf/debian/src/initscripts/lib/init/mount-functions.sh 2011-12-27 02:33:57.594409728 +0000
@@ -340,21 +340,24 @@ run_migrate ()
#
mtab_migrate ()
{
+ if [ -L "/etc/mtab" ] && [ -r /etc/mtab ]; then
+ case "$(readlink "/etc/mtab")" in
+ /proc/mounts|/proc/self/mounts)
+ return 0
+ esac
+ fi
+
# Don't symlink if /proc/mounts does not exist.
if [ ! -r "/proc/mounts" ]; then
return 1
fi
# Create symlink if not already present.
- if [ -L "/etc/mtab" ] && [ "$(readlink "/etc/mtab")" = "/proc/mounts" ]; then
- :
- else
- log_warning_msg "Creating compatibility symlink from /etc/mtab to /proc/mounts."
+ log_warning_msg "Creating compatibility symlink from /etc/mtab to /proc/mounts."
- rm -f "/etc/mtab" || return 1
- ln -fs "/proc/mounts" "/etc/mtab" || return 1
- [ -x /sbin/restorecon ] && /sbin/restorecon "/etc/mtab"
- fi
+ rm -f "/etc/mtab" || return 1
+ ln -fs "/proc/mounts" "/etc/mtab" || return 1
+ [ -x /sbin/restorecon ] && /sbin/restorecon "/etc/mtab"
return 0
}
