diff options
| author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-08-30 18:17:05 +0000 |
|---|---|---|
| committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-08-30 18:17:05 +0000 |
| commit | 9b3aaab75bcbbd6f9f0651a99651a8b552ee9c95 (patch) | |
| tree | ff072b097d428bd4fa76c99c52d99c976a2c76a2 | |
| parent | db0815db174558d652c0ecf102c4e0c2e4817dcd (diff) | |
| download | busybox-w32-9b3aaab75bcbbd6f9f0651a99651a8b552ee9c95.tar.gz busybox-w32-9b3aaab75bcbbd6f9f0651a99651a8b552ee9c95.tar.bz2 busybox-w32-9b3aaab75bcbbd6f9f0651a99651a8b552ee9c95.zip | |
Bug system entry #1 says that when busybox doesn't have swapoff,
init shouldn't call swapoff.
git-svn-id: svn://busybox.net/trunk/busybox@11290 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | init/init.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/init/init.c b/init/init.c index 0f49a45d8..7656bf334 100644 --- a/init/init.c +++ b/init/init.c | |||
| @@ -975,10 +975,8 @@ static void parse_inittab(void) | |||
| 975 | new_init_action(CTRLALTDEL, "/sbin/reboot", ""); | 975 | new_init_action(CTRLALTDEL, "/sbin/reboot", ""); |
| 976 | /* Umount all filesystems on halt/reboot */ | 976 | /* Umount all filesystems on halt/reboot */ |
| 977 | new_init_action(SHUTDOWN, "/bin/umount -a -r", ""); | 977 | new_init_action(SHUTDOWN, "/bin/umount -a -r", ""); |
| 978 | #if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) | ||
| 979 | /* Swapoff on halt/reboot */ | 978 | /* Swapoff on halt/reboot */ |
| 980 | new_init_action(SHUTDOWN, "/sbin/swapoff -a", ""); | 979 | if(ENABLE_SWAPONOFF) new_init_action(SHUTDOWN, "/sbin/swapoff -a", ""); |
| 981 | #endif | ||
| 982 | /* Prepare to restart init when a HUP is received */ | 980 | /* Prepare to restart init when a HUP is received */ |
| 983 | new_init_action(RESTART, "/sbin/init", ""); | 981 | new_init_action(RESTART, "/sbin/init", ""); |
| 984 | /* Askfirst shell on tty1-4 */ | 982 | /* Askfirst shell on tty1-4 */ |