Author: cactus Date: Fri Jun 18 06:36:04 2010 GMT Module: packages Tag: HEAD ---- Log message: - patch0 - fix shutdown/restart on kernels with devtmpfs
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.330 -> 1.331) , rc-scripts-devtmpfs.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.330 packages/rc-scripts/rc-scripts.spec:1.331 --- packages/rc-scripts/rc-scripts.spec:1.330 Wed Jun 16 18:20:36 2010 +++ packages/rc-scripts/rc-scripts.spec Fri Jun 18 08:35:59 2010 @@ -10,12 +10,13 @@ Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.3.3 -Release: 1 +Release: 2 License: GPL v2 Group: Base Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz # Source0-md5: 08863cddc7e7e8d797179ac727ed5dd0 URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ +Patch0: %{name}-devtmpfs.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel @@ -104,6 +105,7 @@ %prep %setup -q +%patch0 -p2 %build %{__aclocal} @@ -350,6 +352,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.331 2010/06/18 06:35:59 cactus +- patch0 - fix shutdown/restart on kernels with devtmpfs + Revision 1.330 2010/06/16 16:20:36 glen - udev conflict was too heavy for ac ================================================================ Index: packages/rc-scripts/rc-scripts-devtmpfs.patch diff -u /dev/null packages/rc-scripts/rc-scripts-devtmpfs.patch:1.1 --- /dev/null Fri Jun 18 08:36:04 2010 +++ packages/rc-scripts/rc-scripts-devtmpfs.patch Fri Jun 18 08:35:59 2010 @@ -0,0 +1,20 @@ +--- /etc/rc.d/rc.shutdown.old 2010-06-18 01:52:20.912246281 +0200 ++++ /etc/rc.d/rc.shutdown 2010-06-18 02:01:41.481643924 +0200 +@@ -75,7 +75,7 @@ + UMOUNT_IGNORE="/ $UMOUNT_IGNORE" + fi + remaining=$(awk -v ig="^($UMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \ +- $3 !~ /^(proc|loopfs|devpts|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \ ++ $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \ + && $1 !~ /^(none|\/dev\/root)$/ \ + && $2 !~ ig {print $2}' /proc/mounts) + while [ -n "$remaining" -a "$retry" -gt 0 ]; do +@@ -99,7 +99,7 @@ + + sleep 2 + remaining=$(awk -v ig="^($UMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \ +- $3 !~ /^(proc|loopfs|devpts|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \ ++ $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \ + && $1 !~ /^(none|\/dev\/root)$/ \ + && $2 !~ ig {print $2}' /proc/mounts) + [ -z "$remaining" ] && break ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.330&r2=1.331&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
