diff options
| author | Michael Banck <mbanck@debian.org> | 2004-09-27 09:59:11 +0000 |
|---|---|---|
| committer | Michael Banck <mbanck@debian.org> | 2004-09-27 09:59:11 +0000 |
| commit | 7b2c157c5cc991f74d7dc8428f56ab1d57467ea2 (patch) | |
| tree | 7fca1273c19ed00783750cabb245da5276c010b2 /debian | |
| parent | 208d10a2dd38e6311bfb09eb3a80c492775ef42e (diff) | |
* Make sure the root file system is read-only during the fsck run, and
update it to be writable again if fsck succeeds. (Closes: #273508)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/rc.patch | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index d31103c1..a77987f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,9 @@ hurd (20040508-4) UNRELEASED; urgency=low * debian/changelog: Added back 20040301-1 entry which got lost. * debian/hurd.install: Do not install /sbin/fsck. (Closes: #272655) * debian/patches/rc.patch: Updated to use e2fsprog's /sbin/fsck - command-line options. + command-line options. Make sure the root file system is read-only + during the fsck run, and update it to be writable again if fsck + succeeds. (Closes: #273508) [ Guillem Jover ] * debian/hurd.postinst: Move /bin/login suid root chmod to debian/rules. diff --git a/debian/patches/rc.patch b/debian/patches/rc.patch index a0fced46..d4a95691 100644 --- a/debian/patches/rc.patch +++ b/debian/patches/rc.patch @@ -1,16 +1,25 @@ ---- hurd/daemons/rc.sh.orig 2004-09-22 14:26:58.000000000 +0200 -+++ hurd/daemons/rc.sh 2004-09-22 14:27:23.000000000 +0200 -@@ -19,7 +19,8 @@ +--- hurd/daemons/rc.sh.orig 2004-09-27 11:54:22.000000000 +0200 ++++ hurd/daemons/rc.sh 2004-09-27 11:54:27.000000000 +0200 +@@ -19,14 +19,17 @@ echo Automatic boot in progress... date - /sbin/fsck --preen --writable -+ # taken from Debian GNU/Linux's /etc/init.d/checkfs.sh -+ /sbin/fsck -C -R -A ++ fsysopts / --update --readonly ++ /sbin/fsck -C -A case $? in # Successful completion -@@ -85,7 +86,15 @@ + 0) ++ fsysopts / --update --writable + ;; + # Filesystem modified (but ok now) + 1 | 2) ++ fsysopts / --update --writable + ;; + # Fsck couldn't fix it. + 4 | 8) +@@ -85,7 +88,15 @@ fi if test -d /var/run; then @@ -27,7 +36,7 @@ fi echo done -@@ -104,15 +113,25 @@ +@@ -104,15 +115,25 @@ chmod 664 /etc/motd |