- rel 3; support /etc/mtab being symlink to /proc/self/mounts

Changed files:
    rc-scripts-svn.patch -> 1.15
    rc-scripts.spec -> 1.372

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
new file mode 100644 (file)
index 0000000..8f4d487
--- /dev/null
+++ b/rc-scripts-svn.patch
@@ -0,0 +1,37 @@
+Index: rc.d/rc.sysinit
+===================================================================
+--- rc.d/rc.sysinit    (wersja 12419)
++++ rc.d/rc.sysinit    (kopia robocza)
+@@ -465,25 +465,25 @@
+       [ -f /etc/cryptomtab ] && :>/etc/cryptomtab
+ 
+       # Enter root, /proc, /sys and other into mtab.
+-      mount -f /
+-      mount -f /proc
++      mount -f / 2> /dev/null
++      mount -f /proc 2> /dev/null
+       if is_fsmounted tmpfs /run; then
+-              mount -f -t tmpfs run /run
++              mount -f -t tmpfs run /run 2> /dev/null
+       fi
+ 
+       if is_fsmounted usbfs /proc/bus/usb; then
+-              mount -f -t usbfs -o devgid=78,devmode=664 usbfs /proc/bus/usb
++              mount -f -t usbfs -o devgid=78,devmode=664 usbfs /proc/bus/usb 2> /dev/null
+       fi
+ 
+       if is_fsmounted sysfs /sys; then
+-              mount -f -t sysfs sysfs /sys
++              mount -f -t sysfs sysfs /sys 2> /dev/null
+               if is_fsmounted securityfs /sys/kernel/security ; then
+-                      mount -f -t securityfs securityfs /sys/kernel/security
++                      mount -f -t securityfs securityfs /sys/kernel/security 2> /dev/null
+               fi
+       fi
+ 
+       if is_fsmounted selinuxfs /selinux; then
+-              mount -f -t selinuxfs selinuxfs /selinux
++              mount -f -t selinuxfs selinuxfs /selinux 2> /dev/null
+       fi
+ 
+       emit --no-wait root-filesystem

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 3995f8659c391e6ea96c9e05bf3c119af71f5240..4b238a9416e020efa004e119dfea5dc740d75d4d 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,12 +9,13 @@ Summary(pl.UTF-8):    inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.5.1
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Base
 Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 # Source0-md5: 00d0cbd7bb54c89fed07ebce20a4a0b7
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
+Patch0:                %{name}-svn.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -112,6 +113,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p0
 
 # hack, currently this results -lgcc_s not found error:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"