On Sun, May 12, 2013 at 06:24:55PM +0100, Roger Leigh wrote:
> On Sun, May 12, 2013 at 12:31:38AM +0100, Roger Leigh wrote:
> > On Sat, May 11, 2013 at 08:02:36PM +0100, Roger Leigh wrote:
> > > With all the patches applied, /usr will be automatically mounted if
> > > it is present in the /etc/fstab on the rootfs. This works for both
> > > local and nfs. I've not tested LVM, but standard UUIDs work fine.
> > > You can also mount /etc so that this can be independently mounted;
> > > obviously this can't use the fstab, so it's done using an equivalent
> > > set of command-line options as for the rootfs. This is a separate
> > > patch so it can be easily dropped.
> >
> > Additional patch attached to canonicalise mount device names. This
> > isn't just cosmetic--mount requires the device names to match when
> > we try to mount all filesystems in fstab during boot (which we already
> > fixed up for the tmpfs mounts). This does it for all local device
> > paths.
>
> Additional patches to run fsck in the initramfs prior to mounting
> filesystems. It's not possible to do this during normal startup
> in checkroot due to e2fsck special casing fsck of mounted,
> read-only root, but not any other mounted fs such as /usr.
And one final patch to use panic rather than sulogin on fsck failure.
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
>From 58dc30c78bdecc8321023fb1e055944668053c45 Mon Sep 17 00:00:00 2001
From: Roger Leigh <Roger Leigh rle...@debian.org>
Date: Sun, 12 May 2013 18:47:58 +0100
Subject: [PATCH 17/17] functions: checkfs calls panic rather than sulogin
---
scripts/functions | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/scripts/functions b/scripts/functions
index dea9e89..d6e8d75 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -571,12 +571,7 @@ A maintenance shell will now be started.
After performing system maintenance, press CONTROL-D
to terminate the maintenance shell and restart the system."
# Start a single user shell on the console
- if ! sulogin $CONSOLE
- then
- log_failure_msg "Attempt to start maintenance shell failed.
-Will restart in 5 seconds."
- sleep 5
- fi
+ panic "fsck of $NAME failed"
if [ "${verbose}" = "y" ] ; then
log_begin_msg "Will now restart"
fi
--
1.7.10.4
