From ff9c0b411c6b08767b7244ad76e8912e252c29ee Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Fri, 25 Feb 2011 13:00:07 +0100 Subject: [PATCH] Drop duplicate fstab example util-linux and mount both included an fstab example, drop the one in mount. Addresses-Debian-Bug: 507698 --- debian/mount.fstab | 39 --------------------------------------- debian/rules | 1 - 2 files changed, 40 deletions(-) delete mode 100644 debian/mount.fstab diff --git a/debian/mount.fstab b/debian/mount.fstab deleted file mode 100644 index 514f5f47..00000000 --- a/debian/mount.fstab +++ /dev/null @@ -1,39 +0,0 @@ -# /etc/fstab: static file system information. -# -# The following is an example. Please see fstab(5) for further details. -# Please refer to mount(1) for a complete description of mount options. -# -# Format: -# -# -# dump(8) uses the field to determine which file systems need -# to be dumped. fsck(8) uses the column to determine which file -# systems need to be checked--the root file system should have a 1 in -# this field, other file systems a 2, and any file systems that should -# not be checked (such as MS-DOS or NFS file systems) a 0. -# -# The `sw' option indicates that the swap partition is to be activated -# with `swapon -a'. -/dev/hda2 none swap sw 0 0 - -# The `bsdgroups' option indicates that the file system is to be mounted -# with BSD semantics (files inherit the group ownership of the directory -# in which they live). `ro' can be used to mount a file system read-only. -/dev/hda3 / ext2 defaults 0 1 -/dev/hda5 /home ext2 defaults 0 2 -/dev/hda6 /var ext2 defaults 0 2 -/dev/hda7 /usr ext2 defaults,ro 0 2 -/dev/hda8 /usr/local ext2 defaults,bsdgroups 0 2 - -# The `noauto' option indicates that the file system should not be mounted -# with `mount -a'. `user' indicates that normal users are allowed to mount -# the file system. -/dev/cdrom /cdrom iso9660 defaults,noauto,ro,user 0 0 -/dev/fd0 /floppy minix defaults,noauto,user 0 0 -/dev/fd1 /floppy minix defaults,noauto,user 0 0 - -# NFS file systems: -server:/export/usr /usr nfs defaults 0 0 - -# proc file system: -proc /proc proc defaults 0 0 diff --git a/debian/rules b/debian/rules index 96a86006..7bad98ef 100755 --- a/debian/rules +++ b/debian/rules @@ -150,7 +150,6 @@ endif cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done \ fi ifeq ($(DEB_HOST_ARCH_OS),linux) - install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab ifeq ($(arch),$(findstring $(arch),powerpc ppc64)) mv -f debian/util-linux/sbin/fdisk debian/util-linux/sbin/ddisk mv -f debian/util-linux/usr/share/man/man8/fdisk.8 debian/util-linux/usr/share/man/man8/ddisk.8 -- 2.39.5