diff -u sysvinit-2.86.ds1/debian/changelog sysvinit-2.86.ds1/debian/changelog --- sysvinit-2.86.ds1/debian/changelog +++ sysvinit-2.86.ds1/debian/changelog @@ -1,3 +1,9 @@ +sysvinit (2.86.ds1-14.1ubuntu45~hardy1) hardy-proposed; urgency=low + + * Remove initscripts/etc/network/if-up.d/mountnfs.orig. (LP: 314772) + + -- Timo Aaltonen Wed, 07 Jan 2009 18:49:25 +0200 + sysvinit (2.86.ds1-14.1ubuntu45) hardy; urgency=low * Fix handling of fatal fsck errors in the usplash integration. (LP: #209416) reverted: --- sysvinit-2.86.ds1/debian/initscripts/etc/network/if-up.d/mountnfs.orig +++ sysvinit-2.86.ds1.orig/debian/initscripts/etc/network/if-up.d/mountnfs.orig @@ -1,113 +0,0 @@ -#! /bin/sh -# Description: Now that TCP/IP is configured, mount the NFS file -# systems in /etc/fstab if needed. If possible, -# start the portmapper before mounting (this is needed for -# Linux 2.1.x and up). -# -# Also mounts SMB filesystems now, so the name of -# this script is getting increasingly inaccurate. - -PATH=/sbin:/bin -. /lib/init/vars.sh - -. /lib/lsb/init-functions -. /lib/init/mount-functions.sh - -do_start() { - [ -f /etc/fstab ] || return - # - # Read through fstab line by line. If it is NFS, set the flag - # for mounting NFS file systems. If any NFS partition is found and it - # not mounted with the nolock option, we start the portmapper. - # - # If any sec={krb5,krb5i,krb5p} option is given, or any of the file - # systems are nfs4, we'll need to start rpc.gssd and/or rpc.idmapd too; - # we'll leave that to nfs-common. - # - - exec 9<&0 /dev/null || exit 0 - -do_start - -rmdir /var/run/network/mountnfs 2>/dev/null || exit 0