← Back to branch summary

~pr0gg3d/ubuntu/oneiric/util-linux/bug-805886

« back to all changes in this revision

Viewing changes to shlibs/blkid/src/topology/topology.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2010-03-22 17:35:40 UTC
  • mfrom: (1.6.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100322173540-sm083tdtvne1wa5w
Tags: 2.17.2-0ubuntu1
https://launchpad.net/bugs/383697
* Merge from Debian experimental, remaining changes:
  - Since udev is required in Ubuntu, the hwclock.sh init script is
    not called on startup and the hwclockfirst.sh init script is
    removed.
  - Use wildcards for symbols file, since they use versioned symbols
    properly.
  - Remove /etc/adjtime on upgrade if it was not used.
  - Install custom blkid.conf to use /dev/.blkid.tab since we don't
    expect device names to survive a reboot
  - No lsb_release call in mount.preinst since we'd need Pre-Depends
    (LP: #383697).
  - Do not install initramfs hook, since our initramfs already handles
    including blkid.
  - Mention mountall(8) in fstab(5) manpages, along with its special
    options.

* For the case where mount is called with a directory to mount, look
  that directory up in mountall's /lib/init/fstab if we couldn't find
  it mentioned anywhere else.  This means "mount /proc", "mount /sys",
  etc. work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shlibs/blkid/src/topology/topology.c
43
43
 * @ALIGNMENT_OFFSET: indicates how many bytes the beginning o the device is
44
44
 *                    offset from the disk's natural alignment.
45
45
 *
 
46
 * The NAME=value tags are not defined when the corresponding topology value
 
47
 * is zero. The MINIMUM_IO_SIZE should be always defined if kernel provides
 
48
 * topology information.
 
49
 *
46
50
 * Binary interface:
47
51
 *
48
52
 * blkid_probe_get_tolology()
214
218
 
215
219
        if (!chn)
216
220
                return -1;
 
221
        if (!data)
 
222
                return 0;       /* ignore zeros */
217
223
 
218
224
        if (chn->binary) {
219
225
                unsigned long *v =