Mailinglist Archive: opensuse-commit (1003 mails)

< Previous Next >
commit aaa_base
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 05 Jun 2007 18:24:00 +0200
  • Message-id: <20070605162401.0D4E5678183@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package aaa_base
checked in at Tue Jun 5 18:24:00 CEST 2007.

--------
--- aaa_base/aaa_base.changes   2007-06-05 12:30:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes      2007-06-05 18:11:03.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun  5 16:21:04 CEST 2007 - mkoenig@xxxxxxx
+
+- remove nfs, now part of nfs-client 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.kB3713/_old  2007-06-05 18:22:57.000000000 +0200
+++ /var/tmp/diff_new_pack.kB3713/_new  2007-06-05 18:22:57.000000000 +0200
@@ -19,7 +19,7 @@
 PreReq:         /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
 Autoreqprov:    on
 Version:        10.3
-Release:        40
+Release:        41
 Summary:        SUSE Linux Base Package
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         aaa_base.tar.bz2
@@ -131,6 +131,8 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Jun 05 2007 - mkoenig@xxxxxxx
+- remove nfs, now part of nfs-client
 * Tue Jun 05 2007 - ro@xxxxxxx
 - etc/init.d/boot.localfs:
   - handle /sys more like /proc

++++++ aaa_base.post ++++++
--- aaa_base/aaa_base.post      2007-06-01 15:48:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.post 2007-06-05 16:19:31.000000000 +0200
@@ -89,7 +89,7 @@
 #
 # Initialize runlevel links
 #
-%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single nfs}
+%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single}
 %{insserv_force_if_yast etc/init.d/boot.loadmodules etc/init.d/boot.cleanup etc/init.d/boot.rootfsck}
 ## powerfail probably needs empty header ...
 


++++++ aaa_base.specialfilelist ++++++
--- aaa_base/aaa_base.specialfilelist   2007-03-06 16:32:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.specialfilelist      2007-06-05 16:18:36.000000000 +0200
@@ -41,7 +41,6 @@
 %config /etc/init.d/dummy
 %config /etc/init.d/halt
 %config /etc/init.d/network
-%config /etc/init.d/nfs
 %config /etc/init.d/powerfail
 %config /etc/init.d/random
 %config /etc/init.d/route

++++++ aaa_base.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/nfs new/aaa_base/etc/init.d/nfs
--- old/aaa_base/etc/init.d/nfs 2007-03-01 17:32:47.000000000 +0100
+++ new/aaa_base/etc/init.d/nfs 1970-01-01 01:00:00.000000000 +0100
@@ -1,143 +0,0 @@
-#! /bin/bash
-# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Florian La Roche, 1996
-#      Werner Fink <werner@xxxxxxx>, 1996
-#      Burchard Steinbild, 1996
-#
-# Please send feedback to http://www.suse.de/feedback
-#
-# /etc/init.d/nfs
-#
-### BEGIN INIT INFO
-# Provides:       nfs
-# Required-Start: $network $portmap
-# Required-Stop:
-# Default-Start:  3 5
-# Default-Stop:
-# Description:    Imports remote Network File Systems (NFS)
-### END INIT INFO
-
-. /etc/rc.status
-
-nfs=no
-LDCONFIG_NEEDED=0
-while read -r where what type options rest  ; do
-    case "$where" in
-       \#*|"") ;;
-       *) case "$options" in
-           *noauto*) ;;
-           *) if test "$type" = "nfs" -o "$type" = "nfs4" ; then
-                   nfs=yes
-                   case "$where" in
-                       /usr*|/opt*)
-                               LDCONFIG_NEEDED=1
-                               break
-                               ;;
-                       *)
-                               if grep -q -F "^$where" /etc/ld.so.conf; then
-                                   LDCONFIG_NEEDED=1
-                                   break;
-                               fi
-                               ;;
-                   esac
-               fi ;;
-           esac
-    esac
-done < /etc/fstab
-
-rc_reset
-case "$1" in
-    start|reload)
-       echo -n "Importing Net File System (NFS)"
-       if test "$nfs" = yes ; then
-       # Mount all auto NFS devices (-> nfs(5) and mount(8) )
-       #  NFS-Server sometime not reachable during boot phase.
-       #  It's sometime usefull to mount NFS devices in
-       #  background with an ampersand (&) and a sleep time of
-       #  two or more seconds, e.g:
-       #  
-       #   sleep 2 && mount -at nfs,nfs4 &
-       #   sleep 2 
-       #  
-       #  Note: Some people importing the /usr partition.
-       #        Therefore we do _NOT_ use an ampersand!
-       #
-         mount -at nfs,nfs4
-       #
-       # generate new list of available shared libraries
-       #
-         if test "$LDCONFIG_NEEDED" -gt 0; then
-             rc_status
-             sleep 1
-             # check if ld.so.cache needs to be refreshed
-             /etc/init.d/boot.ldconfig start > /dev/null 2>&1
-         fi
-
-         rc_status -v
-       else
-         rc_status -u
-       fi
-       ;;
-    stop)
-       echo -n "Remove Net File System (NFS)"
-       while read -r where what type options rest  ; do
-           case "$where" in
-               \#*|"") ;;
-               *)  if test "$type" = "nfs" ; then
-                       nfs=yes
-                   fi ;;
-           esac
-       done < /etc/mtab
-       if test "$nfs" = "yes" ; then
-         #
-         # Unmount in background because during long timeouts
-         #
-         umount -at nfs,nfs4 &
-         sleep 2
-         rc_status -v
-       else
-         rc_status -u
-       fi
-       ;;
-    restart|force-reload)
-        ## Stop the service and regardless of whether it was
-       ## running or not, start it again.
-       $0 stop
-       $0 start
-       rc_status
-       ;;
-    status)
-       echo -n "Checking for mounted nfs shares (from /etc/fstab):"
-       if test "$nfs" = "yes" ; then
-         while read -r where what type options rest  ; do
-           case "$where" in
-             \#*|"") ;;
-             *) case "$options" in
-                  *noauto*) ;;
-                  *) if test "$type" = "nfs" -o "$type" = "nfs4" ; then
-                       grep -q -F "$where $what nfs" /proc/mounts || rc_failed 3
-                     fi ;;
-                esac
-           esac
-          done < /etc/fstab
-        else
-         rc_failed 3
-       fi
-        rc_status -v
-       ;;
-    try-restart|condrestart)
-       $0 status
-       if test $? = 0; then
-           $0 restart
-       else
-           rc_reset
-       fi
-       rc_status
-       ;;
-    *)
-       echo "Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart}"
-       exit 1
-esac
-rc_exit
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/usr/sbin/rcnfs new/aaa_base/usr/sbin/rcnfs
--- old/aaa_base/usr/sbin/rcnfs 2007-06-05 18:22:57.000000000 +0200
+++ new/aaa_base/usr/sbin/rcnfs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to /etc/init.d/nfs




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >