Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2012-06-10 23:18:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2012-05-26 13:00:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2012-06-10 23:18:47.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 7 13:14:40 UTC 2012 - [email protected] + +- Add fix-swap-priority: fix default swap priority (bnc#731601). + +------------------------------------------------------------------- New: ---- fix-swap-priority.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.7P1zN9/_old 2012-06-10 23:18:48.000000000 +0200 +++ /var/tmp/diff_new_pack.7P1zN9/_new 2012-06-10 23:18:48.000000000 +0200 @@ -93,6 +93,7 @@ Patch42: fixppc.patch Patch43: logind-logout.patch Patch44: fix-getty-isolate.patch +Patch45: fix-swap-priority.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -157,6 +158,7 @@ %patch42 -p1 %patch43 -p1 %patch44 -p1 +%patch45 -p1 %build autoreconf -fiv ++++++ fix-swap-priority.patch ++++++ Index: systemd-37/src/mount.c =================================================================== --- systemd-37.orig/src/mount.c +++ systemd-37/src/mount.c @@ -1485,7 +1485,7 @@ fail: return r; } -static int mount_find_pri(char *options) { +static int mount_find_pri(char *options, int *ret) { char *end, *pri; unsigned long r; @@ -1503,7 +1503,8 @@ static int mount_find_pri(char *options) if (end == pri || (*end != ',' && *end != 0)) return -EINVAL; - return (int) r; + *ret = (int) r; + return 1; } static int mount_load_etc_fstab(Manager *m) { @@ -1539,9 +1540,10 @@ static int mount_load_etc_fstab(Manager path_kill_slashes(where); if (streq(me->mnt_type, "swap")) { - int pri; + int r, pri = -1; - if ((pri = mount_find_pri(me->mnt_opts)) < 0) + r = mount_find_pri(me->mnt_opts,&pri); + if (r < 0) k = pri; else k = swap_add_one(m, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
