diff options
| author | Kjartan Maraas <kmaraas@broadpark.no> | 2008-03-13 12:37:43 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@broadpark.no> | 2008-03-13 12:37:43 +0000 |
| commit | 96239c9c0d93557ad935b42bd41daaff2c8dde42 (patch) | |
| tree | 7c02e54c01f9f8b3ab927c8723dd287526b69d08 | |
| parent | ca6b15440d36b56846288686126e4c42af9289d4 (diff) | |
| parent | 485377354f5c4119d9b93f585ad228bdf4e0254a (diff) | |
| download | initscripts-96239c9c0d93557ad935b42bd41daaff2c8dde42.tar initscripts-96239c9c0d93557ad935b42bd41daaff2c8dde42.tar.gz initscripts-96239c9c0d93557ad935b42bd41daaff2c8dde42.tar.bz2 initscripts-96239c9c0d93557ad935b42bd41daaff2c8dde42.tar.xz initscripts-96239c9c0d93557ad935b42bd41daaff2c8dde42.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/initscripts
| -rw-r--r-- | initscripts.spec | 8 | ||||
| -rwxr-xr-x | rc.d/init.d/netfs | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec index e3496c91..08de49a8 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.65 +Version: 8.67 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -216,6 +216,12 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham <notting@redhat.com> - 8.67-1 +- actually, don't + +* Tue Mar 11 2008 Bill Nottingham <notting@redhat.com> - 8.66-1 +- use upstart to start rhgb (#433156, <cdahlin@ncsu.edu>) + * Mon Mar 10 2008 Bill Nottingham <notting@redhat.com> - 8.65-1 - Add a serial console udev/upstart handler (#434764, indirectly) - Add some upstart notification for sysv scripts (modified from <cjdahlin@ncsu.edu>, #431231) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index aef89709..cfe9264c 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -112,7 +112,7 @@ case "$1" in fi [ -n "$SMBMTAB" ] && action $"Unmounting SMB filesystems: " umount -a -t smbfs [ -n "$CIFSMTAB" ] && action $"Unmounting CIFS filesystems: " umount -a -t cifs - [ -n "$NCPMTAB" ] && action $"Unmounting NCP filesystems: " umount -a -t ncpfs + [ -n "$NCPMTAB" ] && action $"Unmounting NCP filesystems: " umount -a -t ncp,ncpfs rm -f /var/lock/subsys/netfs ;; status) |