From: Juerg Billeter <juerg@paldo.org>
To: linux-kernel@vger.kernel.org
Cc: torvalds@osdl.org
Subject: [PATCH RESEND] Don't remove /sys in initramfs
Date: Fri, 05 Nov 2004 16:26:57 +0100 [thread overview]
Message-ID: <1099668417.4591.2.camel@juerg-p4.bitron.ch> (raw)
Using the "resume" kernel parameter together with an initramfs revealed
a bug that causes removal of the /sys directory in the initramfs' tmpfs,
making the system unbootable.
The source of the problem is that the try_name() function removes
the /sys directory unconditionally, instead of removing it only when it
has been created by try_name().
The attached patch only removes /sys if it has been created before.
Please CC me, I'm not on lkml.
Juerg
--
Signed-off-by: Juerg Billeter <juerg@paldo.org>
diff -upNr linux-2.6.10-rc1-bk15.orig/init/do_mounts.c linux-2.6.10-rc1-bk15/init/do_mounts.c
--- linux-2.6.10-rc1-bk15.orig/init/do_mounts.c 2004-10-18 23:53:51.000000000 +0200
+++ linux-2.6.10-rc1-bk15/init/do_mounts.c 2004-11-05 16:24:17.816549948 +0100
@@ -142,7 +142,7 @@ dev_t __init name_to_dev_t(char *name)
int part;
#ifdef CONFIG_SYSFS
- sys_mkdir("/sys", 0700);
+ int mkdir_err = sys_mkdir("/sys", 0700);
if (sys_mount("sysfs", "/sys", "sysfs", 0, NULL) < 0)
goto out;
#endif
@@ -197,7 +197,8 @@ done:
#ifdef CONFIG_SYSFS
sys_umount("/sys", 0);
out:
- sys_rmdir("/sys");
+ if (!mkdir_err)
+ sys_rmdir("/sys");
#endif
return res;
fail:
next reply other threads:[~2004-11-05 15:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-05 15:26 Juerg Billeter [this message]
2004-11-11 16:33 Juerg Billeter
2004-11-12 0:51 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1099668417.4591.2.camel@juerg-p4.bitron.ch \
--to=juerg@paldo.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®