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

« back to all changes in this revision

Viewing changes to disk-utils/mkswap.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2009-07-16 15:48:23 UTC
  • mfrom: (1.3.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090716154823-i26fshvs4v8h90qh
Tags: 2.16-1ubuntu1
* Merge from Debian, 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.
  - 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).

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
#include "wholedisk.h"
58
58
 
59
59
#ifdef HAVE_LIBUUID
60
 
#include <uuid/uuid.h>
 
60
# ifdef HAVE_UUID_UUID_H
 
61
#  include <uuid/uuid.h>
 
62
#else
 
63
# include <uuid.h>
 
64
# endif
61
65
#endif
62
66
 
63
67
static char * program_name = "mkswap";