Author: arekm Date: Mon Nov 28 20:21:18 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; support /etc/mtab being symlink to /proc/self/mounts
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.371 -> 1.372) , rc-scripts-svn.patch (1.14 -> 1.15) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.371 packages/rc-scripts/rc-scripts.spec:1.372 --- packages/rc-scripts/rc-scripts.spec:1.371 Tue Nov 15 23:10:10 2011 +++ packages/rc-scripts/rc-scripts.spec Mon Nov 28 21:21:13 2011 @@ -10,12 +10,13 @@ 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 @@ -113,6 +114,7 @@ %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" @@ -377,6 +379,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.372 2011/11/28 20:21:13 arekm +- rel 3; support /etc/mtab being symlink to /proc/self/mounts + Revision 1.371 2011/11/15 22:10:10 arekm - rel 2; C lvm2 < 2.02.83 due to --sysinit usage ================================================================ Index: packages/rc-scripts/rc-scripts-svn.patch diff -u /dev/null packages/rc-scripts/rc-scripts-svn.patch:1.15 --- /dev/null Mon Nov 28 21:21:18 2011 +++ packages/rc-scripts/rc-scripts-svn.patch Mon Nov 28 21:21:13 2011 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.371&r2=1.372&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts-svn.patch?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
