Hello community, here is the log from the commit of package util-linux checked in at Mon Dec 11 20:42:13 CET 2006. -------- --- util-linux/util-linux.changes 2006-11-07 13:53:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2006-12-11 12:37:59.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Dec 5 18:13:32 CET 2006 - mkoenig@suse.de + +- default swap to V1 in any case [#205956] + patch: util-linux-2.12r-mkswap_fix.patch +- do not append addr option with each nfs remount [#130625] + patch: util-linux-2.12r-nfs_remount_options.patch +- add README.largedisk about fdisk partition size constraints + [#153657] + +------------------------------------------------------------------- New: ---- README.largedisk util-linux-2.12r-mkswap_fix.patch util-linux-2.12r-nfs_remount_options.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.UeUMna/_old 2006-12-11 20:42:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UeUMna/_new 2006-12-11 20:42:05.000000000 +0100 @@ -16,11 +16,11 @@ Provides: util rawio raw base schedutils Obsoletes: util rawio raw base schedutils PreReq: %install_info_prereq permissions -License: BSD License and BSD-like, GNU General Public License (GPL) - all versions +License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Base Autoreqprov: on Version: 2.12r -Release: 55 +Release: 62 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-%version.tar.bz2 Source2: nologin.c @@ -48,6 +48,7 @@ Source27: renice.8 Source28: mkzimage_cmdline.8 Source29: mkzimage_cmdline.c +Source30: README.largedisk Patch: util-linux-%version.diff Patch2: loop-AES-v3.0a-util-linux-2.12p.diff Patch3: util-linux-2.12-multipleraw.diff @@ -104,6 +105,8 @@ Patch104: util-linux-2.12r-readprofile-mapfile.patch Patch105: util-linux-2.12r-cal_formatting.patch Patch106: util-linux-2.12r-partx.patch +Patch107: util-linux-2.12r-mkswap_fix.patch +Patch108: util-linux-2.12r-nfs_remount_options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed @@ -174,10 +177,12 @@ %patch104 -p1 %patch105 %patch106 -p1 +%patch107 -p1 +%patch108 -p1 # setctsid cp %{S:22} %{S:23} . # nologin and guessfstype -cp %{S:2} %{S:3} %{S:8} %{S:15} %{S:20} %{S:21} %{S:26} . +cp %{S:2} %{S:3} %{S:8} %{S:15} %{S:20} %{S:21} %{S:26} %{S:30} . cd ../klogconsole %patch27 -p1 -b .quiet %patch32 -p1 @@ -406,7 +411,7 @@ %doc hwclock/README.hwclock %doc text-utils/README.col %doc README.loop-AES-v2.2d README.loop-AES-v2.2d.SuSE -%doc README.raw +%doc README.largedisk %config %attr(744,root,root) /etc/init.d/raw %attr(755,root,root) /etc/init.d/nfsboot %config(noreplace) %attr(644,root,root) /etc/raw @@ -607,6 +612,13 @@ %endif %changelog -n util-linux +* Tue Dec 05 2006 - mkoenig@suse.de +- default swap to V1 in any case [#205956] + patch: util-linux-2.12r-mkswap_fix.patch +- do not append addr option with each nfs remount [#130625] + patch: util-linux-2.12r-nfs_remount_options.patch +- add README.largedisk about fdisk partition size constraints + [#153657] * Tue Nov 07 2006 - mkoenig@suse.de - enable partx [#214992] * Tue Oct 10 2006 - mkoenig@suse.de ++++++ util-linux-2.12r-mkswap_fix.patch ++++++ Index: util-linux-2.12r/disk-utils/mkswap.c =================================================================== --- util-linux-2.12r.orig/disk-utils/mkswap.c 2004-12-21 09:21:24.000000000 -0800 +++ util-linux-2.12r/disk-utils/mkswap.c 2006-10-23 17:51:24.636063632 -0700 @@ -602,9 +602,7 @@ version = 1; else /* use version 1 as default, if possible */ - if (PAGES <= V0_MAX_PAGES && PAGES > V1_MAX_PAGES) - version = 0; - else if (linux_version_code() < MAKE_VERSION(2,1,117)) + if (linux_version_code() < MAKE_VERSION(2,1,117)) version = 0; else if (pagesize < 2048) version = 0; ++++++ util-linux-2.12r-nfs_remount_options.patch ++++++ Index: util-linux-2.12r/mount/nfsmount.c =================================================================== --- util-linux-2.12r.orig/mount/nfsmount.c +++ util-linux-2.12r/mount/nfsmount.c @@ -305,8 +305,11 @@ int nfsmount(const char *spec, const cha "excessively long option argument\n")); goto fail; } - sprintf(new_opts, "%s%saddr=%s", - old_opts, *old_opts ? "," : "", s); + if (*flags & MS_REMOUNT) + strcpy(new_opts, old_opts); + else + sprintf(new_opts, "%s%saddr=%s", + old_opts, *old_opts ? "," : "", s); *extra_opts = xstrdup(new_opts); /* Set default options. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org