Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Tue Jan 25 15:30:39 CET 2011. -------- --- util-linux/util-linux.changes 2011-01-18 10:56:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2011-01-25 10:29:41.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 25 09:29:15 UTC 2011 - lnussel@suse.de + +- don't mess with /etc/mtab in %post. aaa_base does that for us + already. + +------------------------------------------------------------------- +Fri Jan 21 12:34:35 UTC 2011 - lnussel@suse.de + +- fix parsing offset= followed by more options (bnc#666150) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- util-linux-2.19-rc1-loop-offset.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.b9lVdL/_old 2011-01-25 15:30:12.000000000 +0100 +++ /var/tmp/diff_new_pack.b9lVdL/_new 2011-01-25 15:30:12.000000000 +0100 @@ -33,7 +33,7 @@ BuildRequires: readline-devel BuildRequires: zlib-devel Version: 2.18.91 -Release: 2 +Release: 3 Url: http://kernel.org/~kzak/util-linux/ Supplements: filesystem(minix) Provides: fsck-with-dev-lock = %{version} @@ -83,6 +83,8 @@ # crypto patch Patch3: util-linux-2.17.1-mount_losetup_crypto.patch Patch4: util-linux-2.17.1-losetup-honor-documented-c-option +# +Patch5: util-linux-2.19-rc1-loop-offset.diff ## ## adjtimex ## @@ -184,6 +186,7 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # cd adjtimex-* @@ -392,12 +395,6 @@ sed -i 's:code=:codepage=:' etc/fstab fi -# if /etc/mtab is a regular file, replace it with a symlink to /proc/self/mounts -# (regular mtab is not written/cleaned-up/supported by systemd) -if [ -f /etc/mtab -o ! -e /etc/mtab ]; then - ln -sf /proc/self/mounts /etc/mtab || : -fi - %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/time.info.gz ++++++ util-linux-2.19-rc1-loop-offset.diff ++++++
From e31694761ca0165bda8a4b8f4b3bdbac548ba464 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel@suse.de> Date: Fri, 21 Jan 2011 11:56:52 +0100 Subject: [PATCH] fix parsing offset= followed by more options
Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de> --- mount/mount.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) Index: util-linux-2.19-rc1/mount/mount.c =================================================================== --- util-linux-2.19-rc1.orig/mount/mount.c +++ util-linux-2.19-rc1/mount/mount.c @@ -2044,12 +2044,21 @@ is_fstab_entry_mounted(struct mntentchn char *p = strstr(mc->m.mnt_opts, "offset="); uintmax_t offset = 0; - if (p && strtosize(p + 7, &offset) != 0) { - if (verbose) - printf(_("mount: ignore %s " - "(unparsable offset= option)\n"), - mc->m.mnt_fsname); - return -1; + if (p) { + char buf[128]; + buf[0] = 0; + strncat(buf, p+7, sizeof(buf)-1); + + if (p = strchr(buf, ',')) + *p = '\0'; + + if (strtosize(buf, &offset) != 0) { + if (verbose) + printf(_("mount: ignore %s " + "(unparsable offset= option)\n"), + mc->m.mnt_fsname); + return -1; + } } if (is_mounted_same_loopfile(mc->m.mnt_dir, mc->m.mnt_fsname, offset)) goto yes; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org