← Back to branch summary

~ubuntu-branches/ubuntu/lucid/util-linux/lucid-security

« back to all changes in this revision

Viewing changes to fdisk/fdisksunlabel.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:
fdisk/fdisksunlabel.c
146
146
 
147
147
                if (sunlabel->version != SSWAP32(SUN_LABEL_VERSION)) {
148
148
                        fprintf(stderr,_("Detected sun disklabel with wrong version [0x%08x].\n"),
149
 
                                sunlabel->version);
 
149
                                SSWAP32(sunlabel->version));
150
150
                        need_fixing = 1;
151
151
                }
152
152
                if (sunlabel->sanity != SSWAP32(SUN_LABEL_SANE)) {
153
153
                        fprintf(stderr,_("Detected sun disklabel with wrong sanity [0x%08x].\n"),
154
 
                                sunlabel->sanity);
 
154
                                SSWAP32(sunlabel->sanity));
155
155
                        need_fixing = 1;
156
156
                }
157
157
                if (sunlabel->num_partitions != SSWAP16(SUN_NUM_PARTITIONS)) {
158
158
                        fprintf(stderr,_("Detected sun disklabel with wrong num_partitions [%u].\n"),
159
 
                                sunlabel->num_partitions);
 
159
                                SSWAP16(sunlabel->num_partitions));
160
160
                        need_fixing = 1;
161
161
                }
162
162
                if (need_fixing) {