Merge lp:~ubuntu-branches/ubuntu/oneiric/base-files/oneiric-201105041859 into lp:ubuntu/oneiric/base-files

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/base-files now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/base-files/oneiric-201105041859. A merge should be performed if necessary.

[James Westby (james-w)]

Hi,

It appears as though Scott had changes that were staged in bzr and not uploaded,
and they weren't part of the next upload.

Thanks,

James

[Colin Watson (cjwatson)]

Indeed - i.e. real merge required.

[Scott Moser (smoser)]

Well, Scott's changes can fairly easily be re-applied to current oneiric. His changelog entries describe the conflicting changes.
http://paste.ubuntu.com/628527/

[Barry Warsaw (barry)]

I'll sponsor the patch, but I do get one warning when I install the resulting .deb:

(Reading database ... 298323 files and directories currently installed.)
Preparing to replace base-files 6.3ubuntu2 (using base-files_6.3ubuntu3_amd64.deb) ...
Unpacking replacement base-files ...
dpkg: warning: unable to delete old directory '/var/lock': Device or resource busy
Setting up base-files (6.3ubuntu3) ...
Processing triggers for man-db ...
Processing triggers for install-info ...

=== modified file 'debian/1777-dirs'
--- debian/1777-dirs	2002-02-08 16:36:54 +0000
+++ debian/1777-dirs	2011-05-04 19:04:14 +0000
@@ -1,3 +1,2 @@
 tmp
-var/lock
 var/tmp
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-05-04 10:31:43 +0000
+++ debian/changelog	2011-05-04 19:04:14 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 base-files (6.3ubuntu1) oneiric; urgency=low
 
   * Merge with Debian; remaining changes:
@@ -160,6 +161,17 @@
  -- Santiago Vila <[e-mail]>  Sun, 31 Jan 2010 13:16:14 +0100
 
 base-files (5.0.0ubuntu29) oneiric; urgency=low
+=======
+base-files (5.0.0ubuntu30) UNRELEASED; urgency=low
+
+  * debian/1777-dirs: remove /var/lock (replaced by /run/lock on tmpfs)
+  * debian/directory-list: remove /var/run and /var/lock, add /run
+  * debian/postinst.in: replace references to /var/run with /run
+
+ -- Scott James Remnant <[e-mail]>  Tue, 03 May 2011 14:33:55 -0700
+
+base-files (5.0.0ubuntu29) natty; urgency=low
+>>>>>>> MERGE-SOURCE
 
   * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Oneiric!
 
 
=== modified file 'debian/directory-list'
--- debian/directory-list	2011-05-04 10:31:43 +0000
+++ debian/directory-list	2011-05-04 19:04:14 +0000
@@ -12,6 +12,7 @@
 mnt
 proc
 root
+run
 sbin
 tmp
 usr
@@ -34,8 +35,6 @@
 var/lib/dpkg
 var/lib/misc
 var/local
-var/lock
 var/log
-var/run
 var/spool
 var/tmp
 
=== modified file 'debian/postinst.in'
--- debian/postinst.in	2011-05-04 10:31:43 +0000
+++ debian/postinst.in	2011-05-04 19:04:14 +0000
@@ -67,6 +67,7 @@
     echo -n>/var/log/lastlog
   fi
   chown root:utmp /var/log/wtmp /var/log/btmp /var/log/lastlog
+<<<<<<< TREE
   chmod 664 /var/log/wtmp /var/log/lastlog
   chmod 660 /var/log/btmp
   if [ ! -f /var/run/utmp ]; then
@@ -75,6 +76,33 @@
   chown root:utmp /var/run/utmp
   chmod 664 /var/run/utmp
 fi
+=======
+  chmod 664 /var/log/wtmp /var/log/btmp /var/log/lastlog
+fi
+
+if [ "$1" = "configure" ] && [ "$2" != "" ]; then
+  if [ ! -d /var/spool/mail ] && [ ! -L /var/spool/mail ]; then
+    if [ -f /etc/base-files.mailsymlink ]; then
+      ln -sf `cat /etc/base-files.mailsymlink` /var/spool/mail
+    else
+      install_directory var/spool/mail 2775 mail
+    fi
+  fi
+  if [ ! -L /var/mail ] && [ ! -d /var/mail ]; then
+    ln -sf spool/mail /var/mail
+  fi
+fi
+
+preserve_directory floppy
+preserve_directory cdrom
+preserve_directory initrd
+
+if [ ! -f /run/utmp ]; then
+  echo -n>/run/utmp
+fi
+chown root:utmp /run/utmp
+chmod 664 /run/utmp
+>>>>>>> MERGE-SOURCE
 
 if [ ! -d /var/lib/dpkg ]; then
   mkdir -m 755 -p /var/lib/dpkg
@@ -93,12 +121,12 @@
 fi
 
 # Establish a fresh MOTD on package upgrade, ensures that the symlink is not broken
-[ -d "/etc/update-motd.d" ] && run-parts --lsbsysinit /etc/update-motd.d > /var/run/motd || true
+[ -d "/etc/update-motd.d" ] && run-parts --lsbsysinit /etc/update-motd.d > /run/motd || true
 
 if dpkg --compare-versions "$2" lt 5.0.0ubuntu17 && [ ! -e "/etc/motd" ]; then
   # Create symlink on installation (or versioned upgrade);
   # thereafter, the admin is free to modify accordingly
-  ln -sf /var/run/motd /etc/motd
+  ln -sf /run/motd /etc/motd
 fi
 
 if [ "$1" = "configure" ] && [ "$2" != "" ]; then
@@ -109,7 +137,7 @@
       # text to the pam_motd dynamically generated motd
       mv -f /etc/motd.tail /etc/motd.tail.old
       # Clear out old MOTD, will be regenerated on next login
-      rm -f /var/run/motd
+      rm -f /run/motd
     fi
   fi
   # If we're upgrading base-files, remove the upgrade-available flag